Some spit and polish

This commit is contained in:
Steve Chamberlain
1993-02-05 18:07:09 +00:00
parent 3fa4d3e31e
commit e4ebb8e5e6
3 changed files with 413 additions and 361 deletions

View File

@ -43,7 +43,6 @@ extern struct target_ops sim_ops; /* Forward declaration */
void sim_store_register ();
void sim_set_oc ();
int
sim_write_inferior_memory (memaddr, myaddr, len)
CORE_ADDR memaddr;
@ -71,8 +70,6 @@ int regno;
}
}
void
sim_kill (arg, from_tty)
char *arg;
@ -81,8 +78,6 @@ int from_tty;
}
/*
* Download a file specified in 'args', to the sim.
*/
@ -117,11 +112,13 @@ int fromtty;
int i;
int delta = 4096;
char *buffer = xmalloc (delta);
printf_filtered ("%s\t: 0x%4x .. 0x%4x ",
s->name, s->vma, s->vma + s->_raw_size);
for (i = 0; i < s->_raw_size; i += delta)
{
int sub_delta = delta;
if (sub_delta > s->_raw_size - i)
sub_delta = s->_raw_size - i;
@ -164,8 +161,6 @@ sim_create_inferior (execfile, args, env)
proceed (entry_pt, -1, 0);
}
static void
sim_open (name, from_tty)
char *name;
@ -211,7 +206,6 @@ sim_detach (args,from_tty)
/* Tell the remote machine to resume. */
/* Wait until the remote machine stops, then return,
storing status in STATUS just as `wait' would. */
@ -223,7 +217,6 @@ sim_wait (status)
return 0;
}
/* Get ready to modify the registers array. On machines which store
individual registers, this doesn't need to do anything. On machines
which store all the registers in one fell swoop, this makes sure
@ -236,7 +229,6 @@ sim_prepare_to_store ()
/* Do nothing, since we can store individual regs */
}
static void
fetch_register (regno)
int regno;
@ -246,8 +238,10 @@ int regno;
for (regno = 0; regno < 16; regno++)
fetch_register (regno);
}
else {
else
{
char buf[MAX_REGISTER_RAW_SIZE];
sim_fetch_register (regno, buf);
supply_register (regno, buf);
}
@ -288,6 +282,7 @@ void
sim_files_info ()
{
char *file = "nothing";
if (exec_bfd)
file = bfd_get_filename (exec_bfd);
@ -305,7 +300,6 @@ sim_before_main_loop ()
push_target (&sim_ops);
}
/* Clear the sims notion of what the break points are */
static void
sim_mourn ()
@ -314,7 +308,8 @@ sim_mourn()
generic_mourn_inferior ();
}
static void rem_resume(a,b)
static void
rem_resume (a, b)
int a;
int b;
{
@ -348,19 +343,14 @@ struct target_ops sim_ops =
OPS_MAGIC, /* Always the last thing */
};
/***********************************************************************/
void
_initialize_remote_sim ()
{
extern int sim_z8001_mode;
sim_z8001_mode = z8001_mode;
add_target (&sim_ops);
}

View File

@ -1,5 +1,5 @@
/* Parameters for execution on a z8000 series machine.
Copyright 1992 Free Software Foundation, Inc.
Copyright 1992,1993 Free Software Foundation, Inc.
This file is part of GDB.
@ -158,16 +158,13 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
#define PTR_SIZE (BIG ? 4: 2)
#define PTR_MASK (BIG ? 0xff00ffff : 0x0000ffff)
/* Store the address of the place in which to copy the structure the
subroutine will return. This is called from call_function. */
#define STORE_STRUCT_RETURN(ADDR, SP) store_struct_return(ADDR,SP)
#define STORE_STRUCT_RETURN(ADDR, SP) abort();
/* Extract from an array REGBUF containing the (raw) register state
a function return value of type TYPE, and copy that, in virtual format,
@ -176,13 +173,12 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
extract_return_value(TYPE,REGBUF,VALBUF)
bcopy(REGBUF + REGISTER_BYTE(2), VALBUF, TYPE_LENGTH(TYPE));
/* Write into appropriate registers a function return value
of type TYPE, given in virtual format. Assumes floats are passed
in d0/d1. */
of type TYPE, given in virtual format. */
#define STORE_RETURN_VALUE(TYPE,VALBUF) store_return_value(TYPE,VALBUF);
#define STORE_RETURN_VALUE(TYPE,VALBUF) abort();
/* Extract from an array REGBUF containing the (raw) register state
the address in which a function should return its structure value,
@ -195,10 +191,13 @@ extern CORE_ADDR mz8k_skip_prologue PARAMS ((CORE_ADDR ip));
/* FRAME_CHAIN takes a frame's nominal address and produces the frame's
chain-pointer.
In the case of the 68000, the frame's nominal address
is the address of a 4-byte word containing the calling frame's address. */
In the case of the Z8000, the frame's nominal address
is the address of a ptr sized byte word containing the calling
frame's address. */
#define FRAME_CHAIN(thisframe) frame_chain(thisframe);
#define FRAME_CHAIN(thisframe) frame_chain(thisframe)
/* Define other aspects of the stack frame. */
@ -302,8 +301,6 @@ int z8001_mode;
#define NO_STD_REGS
#define PRINT_REGISTER_HOOK(regno) print_register_hook(regno)
@ -312,4 +309,6 @@ int z8001_mode;
#define NAMES_HAVE_UNDERSCORE
#define ADDITIONAL_OPTIONS {"z8001",no_argument,&z8001_mode, 1},
#define INIT_EXTRA_SYMTAB_INFO \
z8k_set_pointer_size(objfile->obfd->arch_info->bits_per_address);

View File

@ -1,5 +1,5 @@
/* Target-machine dependent code for Zilog Z8000, for GDB.
Copyright (C) 1992 Free Software Foundation, Inc.
Copyright (C) 1992,1993 Free Software Foundation, Inc.
This file is part of GDB.
@ -22,14 +22,13 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
sac@cygnus.com
*/
#include "defs.h"
#include "frame.h"
#include "obstack.h"
#include "symtab.h"
#include "gdbcmd.h"
#include "gdbtypes.h"
/* Return the saved PC from this frame.
If the frame has a memory copy of SRP_REGNUM, use that. If not,
@ -51,12 +50,10 @@ FRAME frame;
#define IS_SUB_SP(x) ((x & 0xffff) == 0x020f)
#define IS_PUSH_FP(x) (BIG ? (x == 0x93ea) : (x == 0x93fa))
/* work out how much local space is on the stack and
return the pc pointing to the first push */
static
CORE_ADDR
static CORE_ADDR
skip_adjust (pc, size)
CORE_ADDR pc;
int *size;
@ -80,7 +77,6 @@ int *size;
return pc;
}
int
examine_frame (pc, regs, sp)
CORE_ADDR pc;
@ -91,8 +87,6 @@ CORE_ADDR sp;
int offset = 0;
int regno;
for (regno = 0; regno < NUM_REGS; regno++)
regs->regs[regno] = 0;
@ -105,7 +99,8 @@ CORE_ADDR sp;
regs->regs[(w & 0xf) + 1] = offset + 2;
offset += 4;
}
else {
else
{
regs->regs[w & 0xf] = offset;
offset += 2;
}
@ -136,14 +131,17 @@ CORE_ADDR sp;
return pc;
}
CORE_ADDR z8k_skip_prologue(start_pc)
CORE_ADDR
z8k_skip_prologue (start_pc)
CORE_ADDR start_pc;
{
struct frame_saved_regs dummy;
return examine_frame (start_pc, &dummy, 0);
}
CORE_ADDR addr_bits_remove(x)
CORE_ADDR
addr_bits_remove (x)
CORE_ADDR x;
{
return x & PTR_MASK;
@ -168,11 +166,13 @@ frame_chain (thisframe)
{
return read_memory_pointer ((thisframe)->frame);
}
return 0;
}
init_frame_pc() { abort(); }
init_frame_pc ()
{
abort ();
}
/* Put here the code to store, into a struct frame_saved_regs,
the addresses of the saved registers of frame described by FRAME_INFO.
@ -180,13 +180,15 @@ init_frame_pc() { abort(); }
ways in the stack frame. sp is even more special:
the address we return for it IS the sp for the next frame. */
void get_frame_saved_regs(frame_info, frame_saved_regs)
void
get_frame_saved_regs (frame_info, frame_saved_regs)
struct frame_info *frame_info;
struct frame_saved_regs *frame_saved_regs;
{
CORE_ADDR pc;
int w;
bzero (frame_saved_regs, sizeof (*frame_saved_regs));
pc = get_pc_function_start (frame_info->pc);
@ -195,46 +197,35 @@ examine_frame(pc, frame_saved_regs, frame_info->frame);
}
extract_return_value(valtype, regbuf, valbuf)
struct type *valtype;
char regbuf[REGISTER_BYTES];
char *valbuf;
void
z8k_push_dummy_frame ()
{
bcopy(regbuf + REGISTER_BYTE(2), valbuf, TYPE_LENGTH(valtype));
abort ();
}
void z8k_push_dummy_frame() { abort(); }
int print_insn(memaddr, stream)
int
print_insn (memaddr, stream)
CORE_ADDR memaddr;
FILE *stream;
{
char temp[20];
read_memory (memaddr, temp, 20);
if (BIG) {
if (BIG)
{
return print_insn_z8001 (memaddr, temp, stream);
}
else {
else
{
return print_insn_z8002 (memaddr, temp, stream);
}
}
void
store_return_value()
{
abort();
}
void
store_struct_return() { abort(); }
/* Fetch the instruction at ADDR, returning 0 if ADDR is beyond LIM or
is not the address of a valid instruction, the address of the next
instruction beyond ADDR otherwise. *PWORD1 receives the first word
of the instruction.*/
CORE_ADDR
NEXT_PROLOGUE_INSN (addr, lim, pword1)
CORE_ADDR addr;
@ -245,6 +236,7 @@ short *pword1;
{
read_memory (addr, pword1, sizeof (*pword1));
SWAP_TARGET_AND_HOST (pword1, sizeof (short));
return addr + 2;
}
@ -252,7 +244,6 @@ short *pword1;
}
/* Put here the code to store, into a struct frame_saved_regs,
the addresses of the saved registers of frame described by FRAME_INFO.
This includes special registers such as pc and fp saved in special
@ -281,13 +272,16 @@ frame_find_saved_regs (fip, fsrp)
for (i = 0; i < 8; i++)
{
int word = read_memory_short (pc);
pc += 2;
if (IS_PUSHL(word)) {
if (IS_PUSHL (word))
{
fsrp->regs[word & 0xf] = adr;
fsrp->regs[(word & 0xf) + 1] = adr - 2;
adr -= 4;
}
else if (IS_PUSHW(word)) {
else if (IS_PUSHW (word))
{
fsrp->regs[word & 0xf] = adr;
adr -= 2;
}
@ -303,7 +297,10 @@ frame_find_saved_regs (fip, fsrp)
}
void
addr_bits_set() { abort(); }
addr_bits_set ()
{
abort ();
}
int
saved_pc_after_call ()
@ -319,6 +316,7 @@ int regno;
if ((regno & 1) == 0 && regno < 16)
{
unsigned short l[2];
read_relative_register_raw_bytes (regno, (char *) (l + 0));
read_relative_register_raw_bytes (regno + 1, (char *) (l + 1));
printf ("\t");
@ -328,6 +326,7 @@ int regno;
if ((regno & 3) == 0 && regno < 16)
{
unsigned short l[4];
read_relative_register_raw_bytes (regno, l + 0);
read_relative_register_raw_bytes (regno + 1, l + 1);
read_relative_register_raw_bytes (regno + 2, l + 2);
@ -340,17 +339,18 @@ int regno;
{
unsigned short rval;
int i;
read_relative_register_raw_bytes (regno, (char *) (&rval));
printf ("\n");
for (i = 0; i < 10; i+=2) {
for (i = 0; i < 10; i += 2)
{
printf ("(sp+%d=%04x)", i, read_memory_short (rval + i));
}
}
}
void
register_convert_to_virtual (regnum, from, to)
unsigned char *from;
@ -373,6 +373,69 @@ char *from;
to[3] = from[3];
}
void
z8k_pop_frame ()
{
}
struct cmd_list_element *setmemorylist;
void z8k_pop_frame() { }
void
z8k_set_pointer_size (newsize)
int newsize;
{
static int oldsize = 0;
if (oldsize != newsize)
{
printf ("pointer size set to %d bits\n", newsize);
oldsize = newsize;
if (newsize == 32)
{
BIG = 1;
}
else
{
BIG = 0;
}
_initialize_gdbtypes ();
}
}
static void
segmented_command (args, from_tty)
char *args;
int from_tty;
{
z8k_set_pointer_size (16);
}
static void
unsegmented_command (args, from_tty)
char *args;
int from_tty;
{
z8k_set_pointer_size (16);
}
static void
set_memory (args, from_tty)
char *args;
int from_tty;
{
printf ("\"set memory\" must be followed by the name of a memory subcommand.\n");
help_list (setmemorylist, "set memory ", -1, stdout);
}
_initialize_z8ktdep ()
{
add_prefix_cmd ("memory", no_class, set_memory,
"set the memory model", &setmemorylist, "set memory ", 0,
&setlist);
add_cmd ("segmented", class_support, segmented_command,
"Set segmented memory model.", &setmemorylist);
add_cmd ("unsegmented", class_support, unsegmented_command,
"Set unsegmented memory model.", &setmemorylist);
}