darkkirb/old-cross-binutils
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

* A few more improvements to gx jit prototype.

Browse source 
[common/ChangeLog]
1998-12-01  Frank Ch. Eigler  <fche@elastic.org>
	* sim-gx-run.c (sim_engine_run): Use new tgx_info struct to
	collect run-time arguments to gx block.
	* sim-gx.h (sim_gx_function): Corresponding signature change.
	* sim-gx.c (sim_gx_compiled_block_f): Remove nonfunctional code to
	again compile a gx block source file.
	(sim_gx_compiled_block_dispose): Uninstall obsoleted gx block
	shared libraries.
	(sim_gx_block_translate): Always emit new "gx_label_NNNN" labels,
	for basic block entry points, even if !__GNUC__.
[m32r-gx/ChangeLog]
1998-12-01  Frank Ch. Eigler  <fche@elastic.org>
	* Makefile.in (SIM_OBJS): Don't build sim-core.o.
	* configure.in:	Added --enable-sim-inline support.
	Look for "getenv()" function.
	* configure: Rebuilt.
	* config.in: Rebuilt.
	* gx-translate.c: Include "sim-inline.c" for sim-core inlining.
	(m32r_gx_{load,store}*): Update signature.
	(tgx_emit_pre_function): Emit new "tgx_info" struct, update
	callback function signatures.
	(m32r_emit_*_insn): Use new callback signatures.  For all short
	branches in optimized mode, emit direct "goto gx_label_NNNN".
	(tgx_optimize_test): If the GX_OPTIMIZE environment variable is
	set, allow its integer value to override the optimization heuristic.
	* m32r-sim.h: New empty placeholder file.
	* sim-main.c: New empty placeholder file.
	* sim-if.c (sim_create_inferior): Use NULL instead of &abort
	for unimplemented register fondling functions.
	* sim-main.h: Add multiple inclusion guard.  Update callback
	function signatures.
	(tgx_info): New struct for collecting gx block invocation
	arguments.
This commit is contained in:
Frank Ch. Eigler 1998-12-01 13:28:53 +00:00
parent 1ab49c8481
commit 3d7075f5f5
14 changed files with 614 additions and 264 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
sim/common/ChangeLog
View file

@ -1,3 +1,18 @@
start-sanitize-gxsim
1998-12-01 Frank Ch. Eigler <fche@elastic.org>
* sim-gx-run.c (sim_engine_run): Use new tgx_info struct to
collect run-time arguments to gx block.
* sim-gx.h (sim_gx_function): Corresponding signature change.
* sim-gx.c (sim_gx_compiled_block_f): Remove nonfunctional code to
again compile a gx block source file.
(sim_gx_compiled_block_dispose): Uninstall obsoleted gx block
shared libraries.
(sim_gx_block_translate): Always emit new "gx_label_NNNN" labels,
for basic block entry points, even if !__GNUC__.
end-sanitize-gxsim
1998-11-30 Doug Evans <devans@casey.cygnus.com>
* cgen-utils.c (cgen_virtual_opcode_table): Update.

7
sim/common/sim-gx-run.c
View file

@ -88,7 +88,12 @@ sim_engine_run (SIM_DESC sd,
}
/* call into gx function */
rc = (*f)(& cpu->regs, block->pc_flags, block->callbacks);
{
struct tgx_info info = {& cpu->regs,
block->pc_flags,
block->callbacks };
rc = (*f)(& info);
}
/* compute pc_flags checksum */
if(! optimized)

57
sim/common/sim-gx.c
View file

@ -54,33 +54,6 @@ sim_gx_compiled_block_f(sim_gx_compiled_block* gx)
if(f == NULL)
{
/* compile object */
if(gx->object_name == NULL && gx->source_name != NULL)
{
char compile_command[2000];
gx->object_name = strdup(gx->source_name);
/* turn *.c into *.o */
gx->object_name[strlen(gx->object_name)]='o';
/* compute command string to compile object */
sprintf(compile_command,
"make -f %s OBJ=%s SRC=%s gx",
#define GX_MAKEFILE "--no-makefile-yet--"
GX_MAKEFILE,
gx->object_name,
gx->source_name);
rc = system(compile_command);
if(rc != 0)
{
sim_io_error(sd, "Compile error rc %d for GX source %s: %s",
rc,
gx->source_name,
strerror(errno));
}
}
/* load object */
if(gx->object_dlhandle == NULL && gx->object_name != NULL)
{
@ -119,6 +92,8 @@ sim_gx_compiled_block_dispose(sim_gx_compiled_block* gx)
{
SIM_DESC sd = current_state;
int rc;
char compile_command[2000];
char la_name[2000];
/* forget dl information */
gx->function_dlhandle = NULL;
@ -136,6 +111,23 @@ sim_gx_compiled_block_dispose(sim_gx_compiled_block* gx)
gx->object_dlhandle = NULL;
}
/* uninstall shared object */
strcpy(la_name, gx->object_name);
strcpy(strstr(la_name, ".so.0"), ".la");
sprintf(compile_command, "gxtool --mode=uninstall rm -f %s", la_name);
rc = system(compile_command);
if(rc != 0)
{
sim_io_error(sd, "Error during finish: `%s' rc %d",
compile_command, rc);
}
/* erase source */
/* sprintf(compile_command, "rm -f %s", block->source_name); */
/* final gasps */
zfree(gx->source_name);
zfree(gx->object_name);
@ -363,7 +355,7 @@ sim_gx_read_block_list()
sim_gx_block_add(gx);
}
print_gx_blocks(STATE_BLOCKS(sd), "after restoring state");
/* print_gx_blocks(STATE_BLOCKS(sd), "after restoring state"); */
}
@ -569,7 +561,7 @@ sim_gx_block_translate(sim_gx_block* gx, int optimized)
fprintf(block->source_file, "\n\n");
fprintf(block->source_file, "extern int\n");
fprintf(block->source_file, "%s", block->symbol_name);
fprintf(block->source_file, "(struct tgx_cpu_regs* regs, char* pc_flags, struct tgx_callbacks* callbacks)\n");
fprintf(block->source_file, "(struct tgx_info* info)\n");
fprintf(block->source_file, "{\n");
fprintf(block->source_file, " int rc = 0;\n");
if(! optimized)
@ -684,13 +676,12 @@ sim_gx_block_translate(sim_gx_block* gx, int optimized)
if((! optimized) ||
(GX_PC_FLAGS(gx, gx_cia) & GX_PCF_JUMPTARGET))
{
fprintf(block->source_file, "#ifdef __GNUC__\n");
fprintf(block->source_file, " gx_label_%ld:\n",
((gx_cia - gx->origin) / gx->divisor));
fprintf(block->source_file, "#else /* ! __GNUC__*/\n");
fprintf(block->source_file, "#ifndef __GNUC__\n");
fprintf(block->source_file, " case %ld:\n",
((gx_cia - gx->origin) / gx->divisor));
fprintf(block->source_file, "#endif /*__GNUC__*/\n");
fprintf(block->source_file, "#endif /* !__GNUC__ */\n");
}
/* translate breakpoint check & exit */
@ -821,7 +812,7 @@ sim_gx_block_translate(sim_gx_block* gx, int optimized)
/* clean up */
sprintf(compile_command, "rm -f lib%s.la %s.lo", base_name, base_name);
sprintf(compile_command, "gxtool --silent --mode=uninstall rm -f lib%s.la %s.lo", base_name, base_name);
rc = system(compile_command);
if(rc != 0)
{

4
sim/common/sim-gx.h
View file

@ -92,8 +92,8 @@ typedef struct sim_gx_block_list
/* actual gx function pointer type */
struct tgx_cpu_regs;
typedef int (*sim_gx_function)(struct tgx_cpu_regs* cpu, char* pc_flags, struct tgx_callbacks* callbacks);
struct tgx_info;
typedef int (*sim_gx_function)(struct tgx_info* info);
/* return values from gx function */

24
sim/m32r-gx/ChangeLog
View file

@ -1,3 +1,27 @@
1998-12-01 Frank Ch. Eigler <fche@elastic.org>
* Makefile.in (SIM_OBJS): Don't build sim-core.o.
* configure.in: Added --enable-sim-inline support.
Look for "getenv()" function.
* configure: Rebuilt.
* config.in: Rebuilt.
* gx-translate.c: Include "sim-inline.c" for sim-core inlining.
(m32r_gx_{load,store}*): Update signature.
(tgx_emit_pre_function): Emit new "tgx_info" struct, update
callback function signatures.
(m32r_emit_*_insn): Use new callback signatures. For all short
branches in optimized mode, emit direct "goto gx_label_NNNN".
(tgx_optimize_test): If the GX_OPTIMIZE environment variable is
set, allow its integer value to override the optimization heuristic.
* m32r-sim.h: New empty placeholder file.
* sim-main.c: New empty placeholder file.
* sim-if.c (sim_create_inferior): Use NULL instead of &abort
for unimplemented register fondling functions.
* sim-main.h: Add multiple inclusion guard. Update callback
function signatures.
(tgx_info): New struct for collecting gx block invocation
arguments.
1998-11-13 Frank Ch. Eigler <fche@elastic.org>
* (*): New files: snapshot of gx simulator prototype.

2
sim/m32r-gx/Makefile.in
View file

@ -29,7 +29,6 @@ SIM_OBJS = \
sim-bits.o \
sim-break.o \
sim-config.o \
sim-core.o \
sim-endian.o \
sim-events.o \
sim-fpu.o \
@ -46,7 +45,6 @@ SIM_OBJS = \
sim-watch.o \
sim-cpu.o \
sim-engine.o \
sim-core.o \
sim-hload.o \
sim-hrw.o \
sim-reason.o \

3
sim/m32r-gx/config.in
View file

@ -80,6 +80,9 @@
/* Define if you have the getcwd function. */
#undef HAVE_GETCWD
/* Define if you have the getenv function. */
#undef HAVE_GETENV
/* Define if you have the getpagesize function. */
#undef HAVE_GETPAGESIZE

382
sim/m32r-gx/configure vendored
View file

File diff suppressed because it is too large Load diff

2
sim/m32r-gx/configure.in
View file

@ -17,8 +17,10 @@ SIM_AC_OPTION_ALIGNMENT(NONSTRICT_ALIGNMENT)
SIM_AC_OPTION_HOSTENDIAN
SIM_AC_OPTION_DEFAULT_MODEL(m32r/d)
SIM_AC_OPTION_ENVIRONMENT
SIM_AC_OPTION_INLINE
AC_CHECK_LIB(dl, dlopen)
AC_CHECK_FUNCS(getenv)
SIM_AC_OUTPUT

345
sim/m32r-gx/gx-translate.c
View file

@ -10,6 +10,7 @@
#include "sim-main.h"
#include "sim-base.h"
#include "sim-core.h"
#include "sim-inline.c"
#include "sim-gx.h"
#include "sim-assert.h"
#include "targ-vals.h"
@ -20,13 +21,13 @@ void m32r_emit_long_insn(sim_gx_block* block, PCADDR pc, unsigned insn, int opti
void m32r_emit_short_insn(sim_gx_block* block, PCADDR pc, unsigned insn, int optimized);
/* callback functions */
unsigned m32r_gx_load(unsigned pc, unsigned addr);
void m32r_gx_store(unsigned pc, unsigned addr, unsigned data);
signed char m32r_gx_load1(unsigned pc, unsigned addr);
void m32r_gx_store1(unsigned pc, unsigned addr, signed char data);
signed short m32r_gx_load2(unsigned pc, unsigned addr);
void m32r_gx_store2(unsigned pc, unsigned addr, signed short data);
void m32r_gx_syscall(tgx_syscall_data* data);
unsigned m32r_gx_load(tgx_info* info, unsigned pc, unsigned addr);
void m32r_gx_store(tgx_info* info, unsigned pc, unsigned addr, unsigned data);
signed char m32r_gx_load1(tgx_info* info, unsigned pc, unsigned addr);
void m32r_gx_store1(tgx_info* info, unsigned pc, unsigned addr, signed char data);
signed short m32r_gx_load2(tgx_info* info, unsigned pc, unsigned addr);
void m32r_gx_store2(tgx_info* info, unsigned pc, unsigned addr, signed short data);
void m32r_gx_syscall(tgx_info* info, tgx_syscall_data* data);
@ -106,16 +107,33 @@ tgx_emit_pre_function(sim_gx_block* gx, int optimized)
"} tgx_syscall_data;\n");
fprintf(block->source_file, /* match with definition in sim-main.h! */
"struct tgx_info;\n"
"typedef struct tgx_callbacks\n"
"{\n"
" unsigned (*load)(unsigned pc, unsigned addr);\n"
" void (*store)(unsigned pc, unsigned addr, unsigned data);\n"
" signed char (*load1)(unsigned pc, unsigned addr);\n"
" void (*store1)(unsigned pc, unsigned addr, signed char data);\n"
" signed short (*load2)(unsigned pc, unsigned addr);\n"
" void (*store2)(unsigned pc, unsigned addr, signed short data);\n"
" void (*syscall)(tgx_syscall_data* data);\n"
" unsigned (*load)(struct tgx_info* info, unsigned pc, unsigned addr);\n"
" void (*store)(struct tgx_info* info, unsigned pc, unsigned addr, unsigned data);\n"
" signed char (*load1)(struct tgx_info* info, unsigned pc, unsigned addr);\n"
" void (*store1)(struct tgx_info* info, unsigned pc, unsigned addr, signed char data);\n"
" signed short (*load2)(struct tgx_info* info, unsigned pc, unsigned addr);\n"
" void (*store2)(struct tgx_info* info, unsigned pc, unsigned addr, signed short data);\n"
" void (*syscall)(struct tgx_info* info, tgx_syscall_data* data);\n"
"} tgx_callbacks;\n");
fprintf(block->source_file, /* match with definition in sim-main.h! */
"typedef struct tgx_mapping_cache\n"
"{\n"
" unsigned base;\n"
" unsigned bound;\n"
" void* buffer;\n"
"} tgx_mapping_cache;\n");
fprintf(block->source_file, /* match with definition in sim-main.h! */
"typedef struct tgx_info\n"
"{\n"
" struct tgx_cpu_regs* regs;\n"
" char* pc_flags;\n"
" struct tgx_callbacks* callbacks;\n"
"} tgx_info;\n");
}
@ -127,6 +145,10 @@ tgx_emit_load_block(sim_gx_block* gx, int optimized)
ASSERT(block->source_file != NULL);
fprintf(block->source_file, /* match with definition above */
" tgx_cpu_regs* regs = info->regs;\n"
" tgx_callbacks* callbacks = info->callbacks;\n"
" char* pc_flags = info->pc_flags;\n"
"\n"
" unsigned int pc = regs->h_pc;\n"
" unsigned int npc = pc;\n"
" signed int temp;\n"
@ -252,12 +274,20 @@ tgx_optimize_test(sim_gx_block* block)
unsigned_4 current_time = time(NULL);
unsigned_4 constant_time = current_time - block->learn_last_change;
int opt;
char* env;
/* try another optimize run if the system has settled down */
opt = (block->compile_time != 0
&& block->learn_last_change != 0
&& constant_time > block->compile_time);
/* allow override by environment variable */
#ifdef HAVE_GETENV
env = getenv("GX_OPTIMIZE");
if(env)
opt = atoi(env);
#endif
/*
if(opt)
printf("optimize_test: now: %d, chg: %d, comp: %d, count: %d => opt %d\n",
@ -271,7 +301,7 @@ tgx_optimize_test(sim_gx_block* block)
unsigned
m32r_gx_load(unsigned pc, unsigned addr)
m32r_gx_load(struct tgx_info* info, unsigned pc, unsigned addr)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -282,7 +312,7 @@ m32r_gx_load(unsigned pc, unsigned addr)
void
m32r_gx_store(unsigned pc, unsigned addr, unsigned data)
m32r_gx_store(struct tgx_info* info, unsigned pc, unsigned addr, unsigned data)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -292,18 +322,19 @@ m32r_gx_store(unsigned pc, unsigned addr, unsigned data)
signed char
m32r_gx_load1(unsigned pc, unsigned addr)
m32r_gx_load1(struct tgx_info* info, unsigned pc, unsigned addr)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
signed char data = 0;
signed char data = sim_core_read_unaligned_1 (cpu, pc, read_map, addr);
data = sim_core_read_unaligned_1 (cpu, pc, read_map, addr);
return data;
}
void
m32r_gx_store1(unsigned pc, unsigned addr, signed char data)
m32r_gx_store1(struct tgx_info* info, unsigned pc, unsigned addr, signed char data)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -313,7 +344,7 @@ m32r_gx_store1(unsigned pc, unsigned addr, signed char data)
signed short
m32r_gx_load2(unsigned pc, unsigned addr)
m32r_gx_load2(struct tgx_info* info, unsigned pc, unsigned addr)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -324,7 +355,7 @@ m32r_gx_load2(unsigned pc, unsigned addr)
void
m32r_gx_store2(unsigned pc, unsigned addr, signed short data)
m32r_gx_store2(struct tgx_info* info, unsigned pc, unsigned addr, signed short data)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -356,7 +387,7 @@ syscall_write_mem (host_callback *cb, struct cb_syscall *sc,
void
m32r_gx_syscall(tgx_syscall_data* data)
m32r_gx_syscall(struct tgx_info* info, tgx_syscall_data* data)
{
SIM_DESC sd = CURRENT_STATE;
sim_cpu* cpu = STATE_CPU (sd, 0);
@ -384,6 +415,8 @@ m32r_gx_syscall(tgx_syscall_data* data)
data->errcode = s.errcode;
data->result = s.result;
data->result2 = s.result2;
/* XXX: clear read/write cache in info */
}
@ -488,42 +521,42 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
else if(op1 == 0xa && op2 == 0x0)
{
fprintf(f, " /* STB R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " (*(callbacks->store1))(0x%08x, gr%d + %d, gr%d & 0xff);\n", (unsigned)pc, r2, lit2, r1);
fprintf(f, " (*(callbacks->store1))(info, 0x%08x, gr%d + %d, gr%d & 0xff);\n", (unsigned)pc, r2, lit2, r1);
}
else if(op1 == 0xa && op2 == 0x2)
{
fprintf(f, " /* STH R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " (*(callbacks->store2))(0x%08x, gr%d + %d, gr%d & 0xffff);\n", (unsigned)pc, r2, lit2, r1);
fprintf(f, " (*(callbacks->store2))(info, 0x%08x, gr%d + %d, gr%d & 0xffff);\n", (unsigned)pc, r2, lit2, r1);
}
else if(op1 == 0xa && op2 == 0x4)
{
fprintf(f, " /* ST R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " (*(callbacks->store))(0x%08x, gr%d + %d, gr%d);\n", (unsigned)pc, r2, lit2, r1);
fprintf(f, " (*(callbacks->store))(info, 0x%08x, gr%d + %d, gr%d);\n", (unsigned)pc, r2, lit2, r1);
}
else if(op1 == 0xa && op2 == 0x8)
{
fprintf(f, " /* LDB R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " gr%d = (*(callbacks->load1))(0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
fprintf(f, " gr%d = (*(callbacks->load1))(info, 0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
}
else if(op1 == 0xa && op2 == 0x9)
{
fprintf(f, " /* LDUB R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " gr%d = (unsigned char)(*(callbacks->load1))(0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
fprintf(f, " gr%d = (unsigned char)(*(callbacks->load1))(info, 0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
}
else if(op1 == 0xa && op2 == 0xa)
{
fprintf(f, " /* LDH R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " gr%d = (*(callbacks->load2))(0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
fprintf(f, " gr%d = (*(callbacks->load2))(info, 0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
}
else if(op1 == 0xa && op2 == 0xb)
{
fprintf(f, " /* LDUH R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " gr%d = (unsigned short)(*(callbacks->load2))(0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
fprintf(f, " gr%d = (unsigned short)(*(callbacks->load2))(info, 0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
}
else if(op1 == 0xa && op2 == 0xc)
{
fprintf(f, " /* LD R%d,@(%d,R%d) */\n", r1, lit2, r2);
fprintf(f, " gr%d = (*(callbacks->load))(0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
fprintf(f, " gr%d = (*(callbacks->load))(info, 0x%08x, gr%d + %d);\n", r1, (unsigned)pc, r2, lit2);
}
else if(op1 == 0xb && op2 == 0x0)
@ -532,8 +565,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BEQ R%d,R%d,%d */\n", r1, r2, lit2);
fprintf(f, " if (gr%d == gr%d)\n", r1, r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0x1)
@ -542,8 +585,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BNE R%d,R%d,%d */\n", r1, r2, lit2);
fprintf(f, " if (gr%d != gr%d)\n", r1, r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0x8 && r1 == 0)
@ -552,8 +605,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BEQZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d == 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0x9 && r1 == 0)
@ -562,8 +625,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BNEZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d != 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0xa && r1 == 0x0)
@ -572,8 +645,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BLTZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d < 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0xb && r1 == 0x0)
@ -582,8 +665,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BGEZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d >= 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0xc && r1 == 0x0)
@ -592,8 +685,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BLEZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d <= 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xb && op2 == 0xd && r1 == 0x0)
@ -602,8 +705,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BGTZ R%d,%d */\n", r2, lit2);
fprintf(f, " if (gr%d > 0)\n", r2);
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
@ -625,8 +738,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BC %d */\n", lit3);
fprintf(f, " if (cond)\n");
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xf && r1 == 0xd)
@ -635,8 +758,18 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BNC %d */\n", lit3);
fprintf(f, " if (! cond)\n");
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0xf && r1 == 0xe)
@ -645,15 +778,35 @@ m32r_emit_long_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
unsigned retpc = (pc & 0xfffffffc) + 4;
fprintf(f, " /* BL %d */\n", lit3);
fprintf(f, " gr14 = 0x%08x;\n", retpc);
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
}
else if(op1 == 0xf && r1 == 0xf)
{
unsigned newpc = (pc & 0xfffffffc) + (((lit3 << 8) >> 8) << 2);
fprintf(f, " /* BRA %d */\n", lit3);
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
}
else
@ -862,7 +1015,7 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
{
fprintf(f, " {\n");
fprintf(f, " tgx_syscall_data d = { 0x%08x, gr0, gr1, gr2, gr3 };\n", (unsigned) pc);
fprintf(f, " (*(callbacks->syscall))(&d);\n");
fprintf(f, " (*(callbacks->syscall))(info, &d);\n");
fprintf(f, " gr2 = d.errcode;\n");
fprintf(f, " gr1 = d.result;\n");
fprintf(f, " gr0 = d.result2;\n");
@ -886,17 +1039,17 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
else if(op1 == 0x2 && op2 == 0x0)
{
fprintf(f, " /* STB R%d,@R%d */\n", r1, r2);
fprintf(f, " (*(callbacks->store1))(0x%08x, gr%d, gr%d & 0xff);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store1))(info, 0x%08x, gr%d, gr%d & 0xff);\n", (unsigned)pc, r2, r1);
}
else if(op1 == 0x2 && op2 == 0x2)
{
fprintf(f, " /* STH R%d,@R%d */\n", r1, r2);
fprintf(f, " (*(callbacks->store2))(0x%08x, gr%d, gr%d & 0x0000ffff);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store2))(info, 0x%08x, gr%d, gr%d & 0x0000ffff);\n", (unsigned)pc, r2, r1);
}
else if(op1 == 0x2 && op2 == 0x4)
{
fprintf(f, " /* ST R%d,@R%d */\n", r1, r2);
fprintf(f, " (*(callbacks->store))(0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store))(info, 0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
}
else if(op1 == 0x2 && op2 == 0x5)
{
@ -904,56 +1057,56 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " if(lock)\n");
fprintf(f, " {\n");
fprintf(f, " lock = 0;\n");
fprintf(f, " (*(callbacks->store))(0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store))(info, 0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
fprintf(f, " }\n");
}
else if(op1 == 0x2 && op2 == 0x6)
{
fprintf(f, " /* ST R%d,@+R%d */\n", r1, r2);
fprintf(f, " gr%d = gr%d + 4;\n", r2, r2);
fprintf(f, " (*(callbacks->store))(0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store))(info, 0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
}
else if(op1 == 0x2 && op2 == 0x7)
{
fprintf(f, " /* ST R%d,@-R%d */\n", r1, r2);
fprintf(f, " gr%d = gr%d - 4;\n", r2, r2);
fprintf(f, " (*(callbacks->store))(0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
fprintf(f, " (*(callbacks->store))(info, 0x%08x, gr%d, gr%d);\n", (unsigned)pc, r2, r1);
}
else if(op1 == 0x2 && op2 == 0x8)
{
fprintf(f, " /* LDB R%d,@R%d */\n", r1, r2);
fprintf(f, " gr%d = (*(callbacks->load1))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (*(callbacks->load1))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0x9)
{
fprintf(f, " /* LDUB R%d,@R%d */\n", r1, r2);
fprintf(f, " gr%d = (unsigned char)(*(callbacks->load1))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (unsigned char)(*(callbacks->load1))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0xa)
{
fprintf(f, " /* LDH R%d,@R%d */\n", r1, r2);
fprintf(f, " gr%d = (*(callbacks->load2))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (*(callbacks->load2))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0xb)
{
fprintf(f, " /* LDUH R%d,@R%d */\n", r1, r2);
fprintf(f, " gr%d = (unsigned short)(*(callbacks->load2))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (unsigned short)(*(callbacks->load2))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0xc)
{
fprintf(f, " /* LD R%d,@R%d */\n", r1, r2);
fprintf(f, " gr%d = (*(callbacks->load))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (*(callbacks->load))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0xd)
{
fprintf(f, " /* LOCK R%d,@R%d */\n", r1, r2);
fprintf(f, " lock = 1;\n");
fprintf(f, " gr%d = (*(callbacks->load))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (*(callbacks->load))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
}
else if(op1 == 0x2 && op2 == 0xe)
{
fprintf(f, " /* LD R%d,@R%d+ */\n", r1, r2);
fprintf(f, " gr%d = (*(callbacks->load))(0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = (*(callbacks->load))(info, 0x%08x, gr%d);\n", r1, (unsigned)pc, r2);
fprintf(f, " gr%d = gr%d + 4;\n", r2, r2);
}
@ -991,8 +1144,18 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BC %d */\n", c);
fprintf(f, " if (cond)\n");
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0x7 && r1 == 0xd)
@ -1001,8 +1164,18 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
fprintf(f, " /* BNC %d */\n", c);
fprintf(f, " if (! cond)\n");
fprintf(f, " {\n");
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
fprintf(f, " }\n");
}
else if(op1 == 0x7 && r1 == 0xe)
@ -1011,15 +1184,35 @@ m32r_emit_short_insn(sim_gx_block* gx, PCADDR pc, unsigned insn, int optimized)
unsigned retpc = (pc & 0xfffffffc) + 4;
fprintf(f, " /* BL %d */\n", c);
fprintf(f, " gr14 = 0x%08x;\n", retpc);
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
}
else if(op1 == 0x7 && r1 == 0xf)
{
unsigned newpc = (pc & 0xfffffffc) + (((int) c) << 2);
fprintf(f, " /* BRA %d */\n", c);
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
if (optimized &&
(GX_PC_INCLUDES(gx,newpc)) &&
(GX_PC_FLAGS(gx, newpc) & GX_PCF_JUMPTARGET))
{
fprintf(f, " goto gx_label_%ld;\n",
((newpc - gx->origin) / gx->divisor));
}
else
{
fprintf(f, " npc = 0x%08x;\n", newpc);
fprintf(f, " goto %s;\n", (GX_PC_INCLUDES(gx,newpc)) ? "shortjump" : "longjump");
}
}
else if(op1 == 0x7 && op2 == 0x0 && r1 == 0x0 && r1 == 0x0)

1
sim/m32r-gx/m32r-sim.h
View file

@ -0,0 +1 @@
/* place holder */

4
sim/m32r-gx/sim-if.c
View file

@ -142,8 +142,8 @@ sim_create_inferior (sd, abfd, argv, envp)
CPU_PC_STORE (current_cpu) = m32r_h_pc_set;
CPU_PC_FETCH (current_cpu) = m32r_h_pc_get;
CPU_REG_STORE (current_cpu) = & abort;
CPU_REG_FETCH (current_cpu) = & abort;
CPU_REG_STORE (current_cpu) = NULL;
CPU_REG_FETCH (current_cpu) = NULL;
if (abfd != NULL)
addr = bfd_get_start_address (abfd);

1
sim/m32r-gx/sim-main.c Normal file
View file

@ -0,0 +1 @@
/* place holder */

31
sim/m32r-gx/sim-main.h
View file

@ -1,4 +1,7 @@
/* Main header for the m32r. */
/* Main header for the m32r-gx. */
#ifndef SIM_MAIN_H
#define SIM_MAIN_H
#define USING_SIM_BASE_H /* FIXME: quick hack */
@ -56,19 +59,28 @@ typedef struct tgx_syscall_data
} tgx_syscall_data;
struct tgx_info;
/* match with definition in gx-translate.c! */
typedef struct tgx_callbacks
{
unsigned (*load)(unsigned pc, unsigned addr);
void (*store)(unsigned pc, unsigned addr, unsigned data);
signed char (*load1)(unsigned pc, unsigned addr);
void (*store1)(unsigned pc, unsigned addr, signed char data);
signed short (*load2)(unsigned pc, unsigned addr);
void (*store2)(unsigned pc, unsigned addr, signed short data);
void (*syscall)(tgx_syscall_data* data);
unsigned (*load)(struct tgx_info* info, unsigned pc, unsigned addr);
void (*store)(struct tgx_info* info, unsigned pc, unsigned addr, unsigned data);
signed char (*load1)(struct tgx_info* info, unsigned pc, unsigned addr);
void (*store1)(struct tgx_info* info, unsigned pc, unsigned addr, signed char data);
signed short (*load2)(struct tgx_info* info, unsigned pc, unsigned addr);
void (*store2)(struct tgx_info* info, unsigned pc, unsigned addr, signed short data);
void (*syscall)(struct tgx_info* info, tgx_syscall_data* data);
} tgx_callbacks;
typedef struct tgx_info
{
struct tgx_cpu_regs* regs;
char* pc_flags;
struct tgx_callbacks* callbacks;
} tgx_info;
struct _sim_cpu
{
@ -92,3 +104,6 @@ struct sim_state {
appropriate handler. */
SI h_gr_get (SIM_CPU *, UINT);
void h_gr_set (SIM_CPU *, UINT, SI);
#endif /* SIM_MAIN_H */