From f5343df1e1999e66c39b95085b77b547e7d94262 Mon Sep 17 00:00:00 2001 From: Steve Reinhardt Date: Sat, 6 Feb 2016 17:21:20 -0800 Subject: [PATCH] arch: get rid of dummy var init MemOperand variables were being initialized to 0 "to avoid 'uninitialized variable' errors" but these no longer seem to be a problem (with the exception of one use case in POWER that is arguably broken and easily fixed here). Getting rid of the initialization is necessary to set up a subsequent patch which extends memory operands to possibly not be scalars, making the '= 0' initialization no longer feasible. --- src/arch/isa_parser.py | 4 +--- src/arch/power/isa/decoder.isa | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/arch/isa_parser.py b/src/arch/isa_parser.py index 20df0a7db..cbc8651d1 100755 --- a/src/arch/isa_parser.py +++ b/src/arch/isa_parser.py @@ -790,10 +790,8 @@ class MemOperand(Operand): return '' def makeDecl(self): - # Note that initializations in the declarations are solely - # to avoid 'uninitialized variable' errors from the compiler. # Declare memory data variable. - return '%s %s = 0;\n' % (self.ctype, self.base_name) + return '%s %s;\n' % (self.ctype, self.base_name) def makeRead(self, predRead): if self.read_code != None: diff --git a/src/arch/power/isa/decoder.isa b/src/arch/power/isa/decoder.isa index 11d222390..30002fe33 100644 --- a/src/arch/power/isa/decoder.isa +++ b/src/arch/power/isa/decoder.isa @@ -309,10 +309,10 @@ decode OPCODE default Unknown::unknown() { 151: stwx({{ Mem = Rs; }}); 150: stwcx({{ bool store_performed = false; + Mem = Rs; if (Rsv) { if (RsvLen == 4) { if (RsvAddr == EA) { - Mem = Rs; store_performed = true; } } -- 2.30.2