String constant const-ness changes to placate g++ 4.2.

Also some bug fixes in MIPS ISA uncovered by g++ warnings
(Python string compares don't work in C++!).

--HG--
extra : convert_revision : b347cc0108f23890e9b73b3ee96059f0cea96cf6

6 files changed, 10 insertions, 10 deletions

diff --git a/src/arch/mips/isa/base.isa b/src/arch/mips/isa/base.isa
index 7c042f16f..e8e1c856e 100644
--- a/src/arch/mips/isa/base.isa
+++ b/src/arch/mips/isa/base.isa
@@ -82,7 +82,7 @@ output decoder {{
         // Need to find standard way to not print
         // this info. Maybe add bool variable to
         // class?
-        if (mnemonic != "syscall") {
+        if (strcmp(mnemonic, "syscall") != 0) {
             if(_numDestRegs > 0){
                 printReg(ss, _destRegIdx[0]);
             }
@@ -100,7 +100,7 @@ output decoder {{
 
         // Should we define a separate inst. class
         // just for two insts?
-        if(mnemonic == "sll" || mnemonic == "sra"){
+        if (strcmp(mnemonic, "sll") == 0 || strcmp(mnemonic, "sra") == 0) {
             ccprintf(ss,", %d",SA);
         }
 
diff --git a/src/arch/mips/isa/formats/branch.isa b/src/arch/mips/isa/formats/branch.isa
index e959e4c1b..e786b3d9f 100644
--- a/src/arch/mips/isa/formats/branch.isa
+++ b/src/arch/mips/isa/formats/branch.isa
@@ -196,7 +196,7 @@ output decoder {{
 
         ccprintf(ss, "%-10s ", mnemonic);
 
-        if ( mnemonic == "jal" ) {
+        if (strcmp(mnemonic, "jal") == 0) {
             Addr npc = pc + 4;
             ccprintf(ss,"0x%x",(npc & 0xF0000000) | disp);
         } else if (_numSrcRegs == 0) {
diff --git a/src/arch/mips/isa/formats/int.isa b/src/arch/mips/isa/formats/int.isa
index 7fa8e4817..f23c4cbf6 100644
--- a/src/arch/mips/isa/formats/int.isa
+++ b/src/arch/mips/isa/formats/int.isa
@@ -119,7 +119,7 @@ output header {{
                 {
                     //If Bit 15 is 1 then Sign Extend
                     int32_t temp = sextImm & 0x00008000;
-                    if (temp > 0 && mnemonic != "lui") {
+                    if (temp > 0 && strcmp(mnemonic, "lui") != 0) {
                         sextImm |= 0xFFFF0000;
                     }
                 }
@@ -313,7 +313,7 @@ output decoder {{
                 ss << ", ";
             }
 
-            if( mnemonic == "lui")
+            if (strcmp(mnemonic, "lui") == 0)
                 ccprintf(ss, "0x%x ", sextImm);
             else
                 ss << (int) sextImm;
diff --git a/src/arch/mips/isa/formats/mt.isa b/src/arch/mips/isa/formats/mt.isa
index b3520050a..d4c37f812 100644
--- a/src/arch/mips/isa/formats/mt.isa
+++ b/src/arch/mips/isa/formats/mt.isa
@@ -72,9 +72,9 @@ output decoder {{
     {
         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);
-        } else if (mnemonic == "mftgpr") {
+        } else if (strcmp(mnemonic, "mftgpr") == 0) {
             ccprintf(ss, "%-10s r%d, r%d", mnemonic, RD, RT);
         } else {
             ccprintf(ss, "%-10s r%d, r%d", mnemonic, RT, RD);
diff --git a/src/arch/sparc/isa/base.isa b/src/arch/sparc/isa/base.isa
index 4339003e0..ce063bcdc 100644
--- a/src/arch/sparc/isa/base.isa
+++ b/src/arch/sparc/isa/base.isa
@@ -87,7 +87,7 @@ output header {{
             FOrdered=0xF
         };
 
-        extern char * CondTestAbbrev[];
+        extern const char *CondTestAbbrev[];
 
         /**
          * Base class for all SPARC static instructions.
@@ -126,7 +126,7 @@ output header {{
 
 output decoder {{
 
-        char * CondTestAbbrev[] =
+        const char *CondTestAbbrev[] =
         {
             "nev", //Never
             "e", //Equal
diff --git a/src/arch/x86/insts/static_inst.cc b/src/arch/x86/insts/static_inst.cc
index 510295157..d2ec8878c 100644
--- a/src/arch/x86/insts/static_inst.cc
+++ b/src/arch/x86/insts/static_inst.cc
@@ -126,7 +126,7 @@ namespace X86ISA
             {"", "t%db", "t%dw", "", "t%dd", "", "", "", "t%d"};
 
         if (reg < FP_Base_DepTag) {
-            char * suffix = "";
+            const char * suffix = "";
             bool fold = reg & (1 << 6);
             reg &= ~(1 << 6);