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

add back in clobbered MIPS fix for g++ 4.2

Browse source 
--HG--
extra : convert_revision : 80ad1cc32c6e59925526abd274132e4f9e35f0c1
This commit is contained in:
Korey Sewell 2007-11-17 00:02:56 -05:00
parent f2fea63c65
commit 5d23f86e98
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/arch/mips/isa/base.isa
View file

@ -82,7 +82,7 @@ output decoder {{
// Need to find standard way to not print // Need to find standard way to not print
// this info. Maybe add bool variable to // this info. Maybe add bool variable to
// class? // class?
if (mnemonic != "syscall") { if (strcmp(mnemonic, "syscall") != 0) {
if(_numDestRegs > 0){ if(_numDestRegs > 0){
printReg(ss, _destRegIdx[0]); printReg(ss, _destRegIdx[0]);
} }
@ -100,7 +100,7 @@ output decoder {{
// Should we define a separate inst. class // Should we define a separate inst. class
// just for two insts? // just for two insts?
if(mnemonic == "sll" || mnemonic == "sra"){ if (strcmp(mnemonic, "sll") == 0 || strcmp(mnemonic, "sra") == 0) {
ccprintf(ss,", %d",SA); ccprintf(ss,", %d",SA);
} }

2
src/arch/mips/isa/formats/branch.isa
View file

@ -195,7 +195,7 @@ output decoder {{
ccprintf(ss, "%-10s ", mnemonic); ccprintf(ss, "%-10s ", mnemonic);
if ( mnemonic == "jal" ) { if ( strcmp(mnemonic,"jal") == 0 ) {
Addr npc = pc + 4; Addr npc = pc + 4;
ccprintf(ss,"0x%x",(npc & 0xF0000000) | disp); ccprintf(ss,"0x%x",(npc & 0xF0000000) | disp);
} else if (_numSrcRegs == 0) { } else if (_numSrcRegs == 0) {

4
src/arch/mips/isa/formats/int.isa
View file

@ -119,7 +119,7 @@ output header {{
{ {
//If Bit 15 is 1 then Sign Extend //If Bit 15 is 1 then Sign Extend
int32_t temp = sextImm & 0x00008000; int32_t temp = sextImm & 0x00008000;
if (temp > 0 && mnemonic != "lui") { if (temp > 0 && strcmp(mnemonic,"lui") != 0) {
sextImm |= 0xFFFF0000; sextImm |= 0xFFFF0000;
} }
} }
@ -313,7 +313,7 @@ output decoder {{
ss << ", "; ss << ", ";
} }
if( mnemonic == "lui") if(strcmp(mnemonic,"lui") == 0)
ccprintf(ss, "0x%x ", sextImm); ccprintf(ss, "0x%x ", sextImm);
else else
ss << (int) sextImm; ss << (int) sextImm;

4
src/arch/mips/isa/formats/mt.isa
View file

@ -72,9 +72,9 @@ output decoder {{
{ {
std::stringstream ss; std::stringstream ss;
if (mnemonic == "mttc0" || mnemonic == "mftc0") { if (strcmp(mnemonic,"mttc0") == 0 || strcmp(mnemonic,"mftc0") == 0) {
ccprintf(ss, "%-10s r%d, r%d, %d", mnemonic, RT, RD, SEL); ccprintf(ss, "%-10s r%d, r%d, %d", mnemonic, RT, RD, SEL);
} else if (mnemonic == "mftgpr") { } else if (strcmp(mnemonic,"mftgpr") == 0) {
ccprintf(ss, "%-10s r%d, r%d", mnemonic, RD, RT); ccprintf(ss, "%-10s r%d, r%d", mnemonic, RD, RT);
} else { } else {
ccprintf(ss, "%-10s r%d, r%d", mnemonic, RT, RD); ccprintf(ss, "%-10s r%d, r%d", mnemonic, RT, RD);