From 2434e38489bf96ce0ff60dfdfeacc39aed91c470 Mon Sep 17 00:00:00 2001 From: "J.T. Conklin" Date: Mon, 4 Dec 1995 20:27:38 +0000 Subject: [PATCH] * gencode.c (tab): Added several sh3 opcodes. (think): Added printonmatch for A_SSR and A_SPC. * interp.c (SSR, SPC): Added definitions. (saved_state_type): Added ssr and spc registers. --- sim/sh/ChangeLog | 9 ++++++++- sim/sh/gencode.c | 23 +++++++++++++++++++---- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/sim/sh/ChangeLog b/sim/sh/ChangeLog index d63066e..0d75181 100644 --- a/sim/sh/ChangeLog +++ b/sim/sh/ChangeLog @@ -1,3 +1,10 @@ +Mon Dec 4 12:22:24 1995 J.T. Conklin + + * gencode.c (tab): Added several sh3 opcodes. + (think): Added printonmatch for A_SSR and A_SPC. + * interp.c (SSR, SPC): Added definitions. + (saved_state_type): Added ssr and spc registers. + Wed Nov 29 12:39:27 1995 Jim Wilson * gencode.c (tab): In shad/shld definitions, negate R[m] before @@ -32,7 +39,7 @@ Sat Oct 21 13:01:18 1995 Jim Wilson start-sanitize-sh3e Mon Oct 16 18:24:03 1995 Jim Wilson - * interp.c (saved_start_type): Move FP registers to immediately + * interp.c (saved_state_type): Move FP registers to immediately after SR. end-sanitize-sh3e diff --git a/sim/sh/gencode.c b/sim/sh/gencode.c index acba02a..a1874c0 100644 --- a/sim/sh/gencode.c +++ b/sim/sh/gencode.c @@ -64,6 +64,7 @@ op tab[] = {"","","bt.s ", "10001101i8p1....","if(T) {ult = PC; PC+=(SEXT(i)<<1)+2;C+=2;SL(ult+2);}"}, {"","","bf.s ", "10001111i8p1....","if(!T) {ult = PC; PC+=(SEXT(i)<<1)+2;C+=2;SL(ult+2);}"}, {"","","clrmac", "0000000000101000", "MACH = MACL = 0;"}, + {"","","clrs", "0000000001001000", "S= 0;"}, {"","","clrt", "0000000000001000", "T= 0;"}, {"","0","cmp/eq #,R0", "10001000i8*1....", ";T = R0 == SEXT(i);"}, {"","mn","cmp/eq ,", "0011nnnnmmmm0000", "T=R[n]==R[m];"}, @@ -84,18 +85,23 @@ op tab[] = {"n","m","extu.w ,", "0110nnnnmmmm1101", "R[n] = R[m] & 0xffff;"}, {"","n","jmp @", "0100nnnn00101011", "ult = PC; PC=R[n]-2; SL(ult+2);"}, {"","n","jsr @", "0100nnnn00001011", "PR = PC + 4; PC=R[n]-2; if (~doprofile) gotcall(PR,PC+2);SL(PR-2);"}, - {"","n","ldc ,GBR", "0100nnnn00011110", "GBR=R[n];"}, {"","n","ldc ,SR", "0100nnnn00001110", "SET_SR(R[n]);"}, + {"","n","ldc ,GBR", "0100nnnn00011110", "GBR=R[n];"}, {"","n","ldc ,VBR", "0100nnnn00101110", "VBR=R[n];"}, - {"","n","ldc.l @+,GBR", "0100nnnn00010111", "GBR=RLAT(R[n]);R[n]+=4;;"}, + {"","n","ldc ,SSR", "0100nnnn00111110", "SSR=R[n];"}, + {"","n","ldc ,SPC", "0100nnnn01001110", "SPC=R[n];"}, {"","n","ldc.l @+,SR", "0100nnnn00000111", "SET_SR(RLAT(R[n]));R[n]+=4;;"}, + {"","n","ldc.l @+,GBR", "0100nnnn00010111", "GBR=RLAT(R[n]);R[n]+=4;;"}, {"","n","ldc.l @+,VBR", "0100nnnn00100111", "VBR=RLAT(R[n]);R[n]+=4;;"}, + {"","n","ldc.l @+,SSR", "0100nnnn00110111", "SSR=RLAT(R[n]);R[n]+=4;;"}, + {"","n","ldc.l @+,SPC", "0100nnnn01000111", "SPC=RLAT(R[n]);R[n]+=4;;"}, {"","n","lds ,MACH", "0100nnnn00001010", "MACH = R[n];"}, {"","n","lds ,MACL", "0100nnnn00011010", "MACL= R[n];"}, {"","n","lds ,PR", "0100nnnn00101010", "PR = R[n];"}, {"","n","lds.l @+,MACH", "0100nnnn00000110", "MACH = SEXT(RLAT(R[n]));R[n]+=4;"}, {"","n","lds.l @+,MACL", "0100nnnn00010110", "MACL = RLAT(R[n]);R[n]+=4;"}, {"","n","lds.l @+,PR", "0100nnnn00100110", "PR = RLAT(R[n]);R[n]+=4;;"}, + {"","","ldtlb", "0000000000111000", "/*XXX*/ abort();"}, {"","n","mac.w @+,@+", "0100nnnnmmmm1111", "macw(R0,memory,n,m);"}, {"n","","mov #,", "1110nnnni8*1....", "R[n] = SEXT(i);"}, {"n","m","mov ,", "0110nnnnmmmm0011", "R[n] = R[m];"}, @@ -150,6 +156,7 @@ op tab[] = {"","","rte", "0000000000101011", "{ int tmp = PC; PC=RLAT(R[15])+2;R[15]+=4;SET_SR(RLAT(R[15]) & 0x3f3);R[15]+=4;SL(tmp+2);}"}, {"","","rts", "0000000000001011", "ult=PC;PC=PR-2;SL(ult+2);"}, + {"","","sets", "0000000001011000", "S=1;"}, {"","","sett", "0000000000011000", "T=1;"}, {"n","mn","shad ,", "0100nnnnmmmm1100", "R[n] = (R[m] < 0) ? (R[n] >> ((-R[m])&0x1f)) : (R[n] << (R[m] & 0x1f));"}, @@ -166,12 +173,16 @@ op tab[] = {"n","n","shlr2 ", "0100nnnn00001001", "R[n]=UR[n]>>2;"}, {"n","n","shlr8 ", "0100nnnn00011001", "R[n]=UR[n]>>8;"}, {"","","sleep", "0000000000011011", "trap(0xc3,R0,memory,maskl,maskw,little_endian);PC-=2;"}, + {"n","","stc SR,", "0000nnnn00000010", "R[n]=GET_SR();"}, {"n","","stc GBR,", "0000nnnn00010010", "R[n]=GBR;"}, - {"n","","stc SR,", "0000nnnn00000010", "R[n]=GET_SR();"}, {"n","","stc VBR,", "0000nnnn00100010", "R[n]=VBR;"}, + {"n","","stc SSR,", "0000nnnn00110010", "R[n]=SSR;"}, + {"n","","stc SPC,", "0000nnnn01000010", "R[n]=SPC;"}, + {"n","n","stc.l SR,@-", "0100nnnn00000011", "R[n]-=4;WLAT(R[n],GET_SR());"}, {"n","n","stc.l GBR,@-", "0100nnnn00010011", "R[n]-=4;WLAT(R[n],GBR);;"}, - {"n","n","stc.l SR,@-", "0100nnnn00000011", "R[n]-=4;WLAT(R[n],GET_SR());"}, {"n","n","stc.l VBR,@-", "0100nnnn00100011", "R[n]-=4;WLAT(R[n],VBR);"}, + {"n","n","stc.l SSR,@-", "0100nnnn00110011", "R[n]-=4;WLAT(R[n],SSR);"}, + {"n","n","stc.l SPC,@-", "0100nnnn01000011", "R[n]-=4;WLAT(R[n],SPC);"}, {"n","","sts MACH,", "0000nnnn00001010", "R[n]=MACH;"}, {"n","","sts MACL,", "0000nnnn00011010", "R[n]=MACL;"}, {"n","","sts PR,", "0000nnnn00101010", "R[n]=PR;"}, @@ -307,6 +318,8 @@ char *arg_type_list[] = "A_REG_N", "A_SR", "A_VBR", + "A_SSR", + "A_SPC", 0, }; @@ -423,6 +436,8 @@ think (o) printonmatch (&p, "SR", "A_SR"); printonmatch (&p, "GBR", "A_GBR"); printonmatch (&p, "VBR", "A_VBR"); + printonmatch (&p, "SSR", "A_SSR"); + printonmatch (&p, "SPC", "A_SPC"); printonmatch (&p, "MACH", "A_MACH"); printonmatch (&p, "MACL", "A_MACL"); printonmatch (&p, "PR", "A_PR"); -- 2.7.4