changeset 7408e4b599ae in /z/repo/m5 details: http://repo.m5sim.org/m5?cmd=changeset;node=7408e4b599ae description: changed to generate tlaser and tsunami console code at different addresses so the uncachable bit is set for tsunami.
console/Makefile: console/console.c: changed to generate tlaser and tsunami console code at different addresses diffstat: system/alpha/console/Makefile | 19 +++++++++++++------ system/alpha/console/console.c | 7 ++++++- 2 files changed, 19 insertions(+), 7 deletions(-) diffs (59 lines): diff -r 9c1932c86b5e -r 7408e4b599ae system/alpha/console/Makefile --- a/system/alpha/console/Makefile Thu Jul 01 01:28:45 2004 -0400 +++ b/system/alpha/console/Makefile Sun Aug 01 00:50:26 2004 -0400 @@ -20,14 +20,17 @@ $(error The M5 variable must be set) endif -all: console +all: console_tl console_ts dbmentry.o: dbmentry.s g++ -I ../h -I ../palcode -E -P -nostdinc -nostdinc++ -x c++ dbmentry.s | \ $(AS) -m 21164 -o dbmentry.s.o -console.o: console.c - $(CC) -g3 $(INCLUDES) -D _TIME_T -nostdinc++ -o $*.o -c $*.c +console_ts.o: console.c + $(CC) -g3 $(INCLUDES) -D _TIME_T -D TSUNAMI -nostdinc++ -o console_ts.o -c console.c + +console_tl.o: console.c + $(CC) -g3 $(INCLUDES) -D _TIME_T -D TLASER -nostdinc++ -o console_tl.o -c console.c printf.o: printf.c $(CC) -g3 $(INCLUDES) -nostdinc++ -o $*.o -c $*.c @@ -40,9 +43,13 @@ g++ -I ../h -E -P -nostdinc -nostdinc++ -x c++ paljtoslave.s | \ $(AS) -m 21164 -o paljtoslave.s.o -console: console.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o - $(LD) -o console -N -Ttext $(DBMENTRY) -non_shared \ - dbmentry.s.o console.o printf.o paljtokern.s.o paljtoslave.s.o -lc +console_ts: console_ts.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o + $(LD) -o console_ts -N -Ttext $(DBMENTRY) -non_shared \ + dbmentry.s.o console_ts.o printf.o paljtokern.s.o paljtoslave.s.o -lc + +console_tl: console_tl.o dbmentry.o printf.o paljtokern.s.o paljtoslave.s.o + $(LD) -o console_tl -N -Ttext $(DBMENTRY) -non_shared \ + dbmentry.s.o console_tl.o printf.o paljtokern.s.o paljtoslave.s.o -lc install: console scp console zizzer.eecs.umich.edu:/z/m5/system/testing/binaries/console diff -r 9c1932c86b5e -r 7408e4b599ae system/alpha/console/console.c --- a/system/alpha/console/console.c Thu Jul 01 01:28:45 2004 -0400 +++ b/system/alpha/console/console.c Sun Aug 01 00:50:26 2004 -0400 @@ -33,8 +33,13 @@ #define K1BASE 0xfffffc8000000000 #define KSEG_TO_PHYS(x)(((ul)x) & ~KSEG) +#ifdef TSUNAMI +#define ALPHA_ACCESS_BASE 0xfffffd0200000000 +#elif TLASER #define ALPHA_ACCESS_BASE 0xfffffc8000a00000 - +#else +#error TSUNAMI/TLASER not defined. +#endif #define PHYS_TO_K1(_x) (K1BASE|(_x)) _______________________________________________ m5-dev mailing list m5-dev@m5sim.org http://m5sim.org/mailman/listinfo/m5-dev