sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some problems with signed vs. unsigned numbers which were breaking conditional moves and signed divisions. Also did some minor clean ups.

Browse source 
--HG--
extra : convert_revision : 6389ec18387a68ea5b675badfe1fd10cd30c264d
This commit is contained in:
Gabe Black 2006-05-14 23:57:21 -04:00
parent 42313f33ef
commit 149b724b86
1 changed files with 18 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
arch/sparc/isa/decoder.isa
View file

@ -119,11 +119,11 @@ decode OP default Unknown::unknown()
} }
}}); }});
0x0F: sdiv({{ 0x0F: sdiv({{
if(Rs2_or_imm13 == 0) if(Rs2_or_imm13.sdw == 0)
fault = new DivisionByZero; fault = new DivisionByZero;
else else
{ {
Rd.udw = ((YValue << 32) | Rs1.sdw<31:0>) / Rs2_or_imm13; Rd.udw = ((int64_t)((YValue << 32) | Rs1.sdw<31:0>)) / Rs2_or_imm13.sdw;
if(Rd.udw<63:31> != 0) if(Rd.udw<63:31> != 0)
Rd.udw = 0x7FFFFFFF; Rd.udw = 0x7FFFFFFF;
else if(Rd.udw<63:> && Rd.udw<62:31> != 0xFFFFFFFF) else if(Rd.udw<63:> && Rd.udw<62:31> != 0xFFFFFFFF)
@ -166,13 +166,13 @@ decode OP default Unknown::unknown()
{{Rs1<63:> == val2<63:> && val2<63:> != resTemp<63:>}} {{Rs1<63:> == val2<63:> && val2<63:> != resTemp<63:>}}
); );
0x1A: umulcc({{ 0x1A: umulcc({{
uint64_t resTemp, val2 = Rs2_or_imm13; uint64_t resTemp;
Rd = resTemp = Rs1.udw<31:0> * val2<31:0>; Rd = resTemp = Rs1.udw<31:0> * Rs2_or_imm13.udw<31:0>;
YValue = resTemp<63:32>;}}, YValue = resTemp<63:32>;}},
{{0}},{{0}},{{0}},{{0}}); {{0}},{{0}},{{0}},{{0}});
0x1B: smulcc({{ 0x1B: smulcc({{
int64_t resTemp, val2 = Rs2_or_imm13; int64_t resTemp;
Rd = resTemp = Rs1.sdw<31:0> * val2<31:0>; Rd = resTemp = Rs1.sdw<31:0> * Rs2_or_imm13.sdw<31:0>;
YValue = resTemp<63:32>;}}, YValue = resTemp<63:32>;}},
{{0}},{{0}},{{0}},{{0}}); {{0}},{{0}},{{0}},{{0}});
0x1C: subccc({{ 0x1C: subccc({{
@ -185,11 +185,11 @@ decode OP default Unknown::unknown()
{{Rs1<63:> != val2<63:> && Rs1<63:> != resTemp<63:>}} {{Rs1<63:> != val2<63:> && Rs1<63:> != resTemp<63:>}}
); );
0x1D: udivxcc({{ 0x1D: udivxcc({{
if(Rs2_or_imm13 == 0) fault = new DivisionByZero; if(Rs2_or_imm13.udw == 0) fault = new DivisionByZero;
else Rd = Rs1.udw / Rs2_or_imm13;}} else Rd = Rs1.udw / Rs2_or_imm13.udw;}}
,{{0}},{{0}},{{0}},{{0}}); ,{{0}},{{0}},{{0}},{{0}});
0x1E: udivcc({{ 0x1E: udivcc({{
uint32_t resTemp, val2 = Rs2_or_imm13; uint32_t resTemp, val2 = Rs2_or_imm13.udw;
int32_t overflow; int32_t overflow;
if(val2 == 0) fault = new DivisionByZero; if(val2 == 0) fault = new DivisionByZero;
else else
@ -205,7 +205,7 @@ decode OP default Unknown::unknown()
{{0}} {{0}}
); );
0x1F: sdivcc({{ 0x1F: sdivcc({{
int32_t resTemp, val2 = Rs2_or_imm13; int32_t resTemp, val2 = Rs2_or_imm13.sdw;
int32_t overflow, underflow; int32_t overflow, underflow;
if(val2 == 0) fault = new DivisionByZero; if(val2 == 0) fault = new DivisionByZero;
else else
@ -363,8 +363,8 @@ decode OP default Unknown::unknown()
} }
} }
0x2D: sdivx({{ 0x2D: sdivx({{
if(Rs2_or_imm13 == 0) fault = new DivisionByZero; if(Rs2_or_imm13.sdw == 0) fault = new DivisionByZero;
else Rd.sdw = Rs1.sdw / Rs2_or_imm13; else Rd.sdw = Rs1.sdw / Rs2_or_imm13.sdw;
}}); }});
0x2E: decode RS1 { 0x2E: decode RS1 {
0x0: IntOp::popc({{ 0x0: IntOp::popc({{
@ -382,12 +382,12 @@ decode OP default Unknown::unknown()
} }
0x2F: decode RCOND3 0x2F: decode RCOND3
{ {
0x1: movreq({{Rd = (Rs1 == 0) ? Rs2_or_imm10 : Rd;}}); 0x1: movreq({{Rd = (Rs1.sdw == 0) ? Rs2_or_imm10 : Rd;}});
0x2: movrle({{Rd = (Rs1 <= 0) ? Rs2_or_imm10 : Rd;}}); 0x2: movrle({{Rd = (Rs1.sdw <= 0) ? Rs2_or_imm10 : Rd;}});
0x3: movrl({{Rd = (Rs1 < 0) ? Rs2_or_imm10 : Rd;}}); 0x3: movrl({{Rd = (Rs1.sdw < 0) ? Rs2_or_imm10 : Rd;}});
0x5: movrne({{Rd = (Rs1 != 0) ? Rs2_or_imm10 : Rd;}}); 0x5: movrne({{Rd = (Rs1.sdw != 0) ? Rs2_or_imm10 : Rd;}});
0x6: movrg({{Rd = (Rs1 > 0) ? Rs2_or_imm10 : Rd;}}); 0x6: movrg({{Rd = (Rs1.sdw > 0) ? Rs2_or_imm10 : Rd;}});
0x7: movrge({{Rd = (Rs1 >= 0) ? Rs2_or_imm10 : Rd;}}); 0x7: movrge({{Rd = (Rs1.sdw >= 0) ? Rs2_or_imm10 : Rd;}});
} }
0x30: decode RD { 0x30: decode RD {
0x0: wry({{Y = Rs1 ^ Rs2_or_imm13;}}); 0x0: wry({{Y = Rs1 ^ Rs2_or_imm13;}});
@ -492,10 +492,6 @@ decode OP default Unknown::unknown()
xc->syscall(R1); xc->syscall(R1);
#endif #endif
} }
else
{
DPRINTF(Sparc, "Didn't fire on %s\n", CondTestAbbrev[machInst<25:28>]);
}
}}); }});
0x2: Trap::tccx({{ 0x2: Trap::tccx({{
if(passesCondition(CcrXcc, COND2)) if(passesCondition(CcrXcc, COND2))