From b9c7495b11f5f19798e457bd962256f125cb0835 Mon Sep 17 00:00:00 2001
From: clc5q <clc5q@git.zephyr-software.com>
Date: Tue, 2 Feb 2016 20:08:25 +0000
Subject: [PATCH] Derived class fixes to remove const qualifier.

Former-commit-id: 524f44f7d562f7817a19782eb4c9ccdb0cacac56
---
 include/interfaces/irdb/STARSInstruction.h    |  3 ++-
 include/interfaces/irdb/STARSSSAInstruction.h | 14 +++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/include/interfaces/irdb/STARSInstruction.h b/include/interfaces/irdb/STARSInstruction.h
index 68bd5660..1702e682 100644
--- a/include/interfaces/irdb/STARSInstruction.h
+++ b/include/interfaces/irdb/STARSInstruction.h
@@ -29,7 +29,8 @@ class STARS_IRDB_Instruction_t : public STARS_Instruction_t
 			disasm.Argument3.ArgType=NO_ARGUMENT;
 			disasm.Argument4.ArgType=NO_ARGUMENT;
 			strcpy(disasm.Instruction.Mnemonic, "fnop ");	// set to fnop
-			IDAOpcodeCached = false;
+			IDAOpcode = STARS_NN_fnop;
+			IDAOpcodeCached = true;
 		};
 
 		// Constructors and destructors
diff --git a/include/interfaces/irdb/STARSSSAInstruction.h b/include/interfaces/irdb/STARSSSAInstruction.h
index c9885549..cf97ee68 100644
--- a/include/interfaces/irdb/STARSSSAInstruction.h
+++ b/include/interfaces/irdb/STARSSSAInstruction.h
@@ -59,13 +59,13 @@ class STARS_SSA_Instruction_t : public STARS_Instruction_t
 		// Operand creation methods
 		virtual STARSOpndTypePtr MakeVoidOpnd(void) const { assert(0); }
 		virtual STARSOpndTypePtr MakeImmediateOpnd(STARS_uval_t value) const { assert(0); }
-		virtual STARSOpndTypePtr MakeRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeFloatingPointRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMMXRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeXMMRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeYMMRegOpnd(uint16_t RegNum) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMemDisplacementOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor, STARS_ea_t offset) const { assert(0); }
-		virtual STARSOpndTypePtr MakeMemPhraseOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor) const { assert(0); }
+		virtual STARSOpndTypePtr MakeRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeFloatingPointRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeMMXRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeXMMRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeYMMRegOpnd(uint16_t RegNum) { assert(0); }
+		virtual STARSOpndTypePtr MakeMemDisplacementOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor, STARS_ea_t offset) { assert(0); }
+		virtual STARSOpndTypePtr MakeMemPhraseOpnd(uint16_t BaseRegNum, uint16_t IndexRegNum, uint16_t ScaleFactor) { assert(0); }
 
 		// Analysis methods
 
-- 
GitLab