diff options
| author | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-24 22:05:01 -0500 |
|---|---|---|
| committer | Ali Saidi <saidi@eecs.umich.edu> | 2007-02-24 22:05:01 -0500 |
| commit | cf0e202cbad9823bdd3361164f4b2ee41c4c1501 (patch) | |
| tree | 2aaf194ba788e1a370970c8bb1e4c80f29d8cee6 /util/m5 | |
| parent | f01f8f1be6a536580371428aa3e8e654d97fb868 (diff) | |
| download | gem5-cf0e202cbad9823bdd3361164f4b2ee41c4c1501.tar.xz | |
make m5 readfile work on solaris... we can have a solaris regression soon!
src/arch/sparc/isa/decoder.isa:
add readfile and break to sparc decoder
src/arch/sparc/isa/operands.isa:
fix O0-O5 operands registers
util/m5/Makefile.sparc:
Make sparc makefile compile a 64bit binary
util/m5/m5.c:
readfile was in here twice, once will be sufficient I think
util/m5/m5op_sparc.S:
implement readfile and debugbreak
--HG--
extra : convert_revision : 139b3f480ee6342b37b5642e072c8486d91a3944
Diffstat (limited to 'util/m5')
| -rw-r--r-- | util/m5/Makefile.sparc | 4 | ||||
| -rw-r--r-- | util/m5/m5.c | 16 | ||||
| -rw-r--r-- | util/m5/m5op_sparc.S | 21 |
3 files changed, 13 insertions, 28 deletions
diff --git a/util/m5/Makefile.sparc b/util/m5/Makefile.sparc index 835ccb2a4..76d82857b 100644 --- a/util/m5/Makefile.sparc +++ b/util/m5/Makefile.sparc @@ -35,7 +35,7 @@ CC=$(CROSS_COMPILE)gcc AS=$(CROSS_COMPILE)as LD=$(CROSS_COMPILE)ld -CFLAGS=-O2 +CFLAGS=-O2 -m64 OBJS=m5.o m5op_sparc.o all: m5 @@ -47,7 +47,7 @@ all: m5 $(CC) $(CFLAGS) -o $@ -c $< m5: $(OBJS) - $(CC) -o $@ $(OBJS) + $(CC) -m64 -o $@ $(OBJS) clean: rm -f *.o m5 diff --git a/util/m5/m5.c b/util/m5/m5.c index 190289f06..b103796a8 100644 --- a/util/m5/m5.c +++ b/util/m5/m5.c @@ -186,21 +186,5 @@ main(int argc, char *argv[]) m5_loadsymbol(arg1); return 0; } - if (COMPARE("readfile")) { - char buf[256*1024]; - int offset = 0; - int len; - - if (argc != 2) - usage(); - - while ((len = m5_readfile(buf, sizeof(buf), offset)) > 0) { - write(STDOUT_FILENO, buf, len); - offset += len; - } - - return 0; - } - usage(); } diff --git a/util/m5/m5op_sparc.S b/util/m5/m5op_sparc.S index b5c421bdf..40248ff8b 100644 --- a/util/m5/m5op_sparc.S +++ b/util/m5/m5op_sparc.S @@ -49,8 +49,10 @@ func: #define END(func) \ .size func, (.-func) +#define DEBUGBREAK INST(debugbreak_func, 0, 0, 0) #define M5EXIT INST(exit_func, 0, 0, 0) #define PANIC INST(panic_func, 0, 0, 0) +#define READFILE INST(readfile_func, 0, 0, 0) LEAF(m5_exit) retl @@ -62,6 +64,15 @@ LEAF(m5_panic) PANIC END(m5_panic) +LEAF(m5_readfile) + retl + READFILE +END(m5_readfile) + +LEAF(m5_debugbreak) + retl + DEBUGBREAK +END(m5_debugbreak) /* !!!!!! All code below here just panics !!!!!! */ LEAF(arm) @@ -119,16 +130,6 @@ LEAF(m5_checkpoint) PANIC END(m5_checkpoint) -LEAF(m5_readfile) - retl - PANIC -END(m5_readfile) - -LEAF(m5_debugbreak) - retl - PANIC -END(m5_debugbreak) - LEAF(m5_switchcpu) retl PANIC |