Unit tests for CircleRange

Ghidra/Features/Decompiler/src/decompile/cpp/Makefile

@@ -6,7 +6,7 @@ ARCH_TYPE=
 ADDITIONAL_FLAGS=
 SLEIGHVERSION=sleigh-2.1.0
 
-EXTENSION_POINT=../../../../../../../ghidra.ext/Ghidra/Features/DecompilerExtensions/src/decompile/cpp
+EXTENSION_POINT=../../../../../../../ghidra.ext-u/Ghidra/Features/DecompilerExtensions/src/decompile/cpp
 GHIDRA_BIN=../../../../../../../ghidra.bin
 
 OS = $(shell uname -s)

Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.cc

@@ -350,6 +350,13 @@ uintb OpBehaviorInt2Comp::evaluateUnary(int4 sizeout,int4 sizein,uintb in1) cons
   return res;
 }
 
+uintb OpBehaviorInt2Comp::recoverInputUnary(int4 sizeout,uintb out,int4 sizein) const
+
+{
+  uintb res = uintb_negate(out-1,sizein);
+  return res;
+}
+
 uintb OpBehaviorIntNegate::evaluateUnary(int4 sizeout,int4 sizein,uintb in1) const
 
 {
@@ -357,6 +364,13 @@ uintb OpBehaviorIntNegate::evaluateUnary(int4 sizeout,int4 sizein,uintb in1) con
   return res;
 }
 
+uintb OpBehaviorIntNegate::recoverInputUnary(int4 sizeout,uintb out,int4 sizein) const
+
+{
+  uintb res = uintb_negate(out,sizein);
+  return res;
+}
+
 uintb OpBehaviorIntXor::evaluateBinary(int4 sizeout,int4 sizein,uintb in1,uintb in2) const
 
 {

Ghidra/Features/Decompiler/src/decompile/cpp/opbehavior.hh

@@ -227,6 +227,7 @@ class OpBehaviorInt2Comp : public OpBehavior {
 public:
   OpBehaviorInt2Comp(void): OpBehavior(CPUI_INT_2COMP,true) {}	///< Constructor
   virtual uintb evaluateUnary(int4 sizeout,int4 sizein,uintb in1) const;
+  virtual uintb recoverInputUnary(int4 sizeout,uintb out,int4 sizein) const;
 };
 
 /// CPUI_INT_NEGATE behavior
@@ -234,6 +235,7 @@ class OpBehaviorIntNegate : public OpBehavior {
 public:
   OpBehaviorIntNegate(void): OpBehavior(CPUI_INT_NEGATE,true) {}	///< Constructor
   virtual uintb evaluateUnary(int4 sizeout,int4 sizein,uintb in1) const;
+  virtual uintb recoverInputUnary(int4 sizeout,uintb out,int4 sizein) const;
 };
 
 /// CPUI_INT_XOR behavior

Ghidra/Features/Decompiler/src/decompile/cpp/rangeutil.cc

@@ -744,12 +744,18 @@ bool CircleRange::pullBackUnary(OpCode opc,int4 inSize,int4 outSize)
       left = (~right + 1 + step) & mask;
       right = val;
       break;
+    case CPUI_INT_NEGATE:
+      val = (~left + step) & mask;
+      left = (~right + step) & mask;
+      right = val;
+      break;
     case CPUI_INT_ZEXT:
     {
       val = calc_mask(inSize); // (smaller) input mask
+      uintb rem = left % step;
       CircleRange zextrange;
-      zextrange.left = 0;
+      zextrange.left = rem;
-      zextrange.right = val + 1;	// Biggest possible range of ZEXT
+      zextrange.right = val + 1 + rem;	// Biggest possible range of ZEXT
       zextrange.mask = mask;
       zextrange.step = step;	// Keep the same stride
       zextrange.isempty = false;
@@ -763,8 +769,10 @@ bool CircleRange::pullBackUnary(OpCode opc,int4 inSize,int4 outSize)
     case CPUI_INT_SEXT:
     {
       val = calc_mask(inSize); // (smaller) input mask
+      uintb rem = left & step;
       CircleRange sextrange;
       sextrange.left = val ^ (val >> 1); // High order bit for (small) input space
+      sextrange.left += rem;
       sextrange.right = sign_extend(sextrange.left, inSize, outSize);
       sextrange.mask = mask;
       sextrange.step = step;	// Keep the same stride
@@ -1096,13 +1104,15 @@ bool CircleRange::pushForwardUnary(OpCode opc,const CircleRange &in1,int4 inSize
       isempty = false;
       step = in1.step;
       mask = calc_mask(outSize);
-      left = in1.left;
+      if (in1.left == in1.right) {
-      right = (in1.right - in1.step) & in1.mask;
+	left = in1.left % step;
-      if (right < left) {	// Extending causes 2 pieces
-	left = left % step;
 	right = in1.mask + 1 + left;
       }
       else {
+	left = in1.left;
+	right = (in1.right - in1.step) & in1.mask;
+	if (right < left)
+	  return false;	// Extending causes 2 pieces
 	right += step;	// Impossible for it to wrap with bigger mask
       }
       break;
@@ -1110,16 +1120,19 @@ bool CircleRange::pushForwardUnary(OpCode opc,const CircleRange &in1,int4 inSize
       isempty = false;
       step = in1.step;
       mask = calc_mask(outSize);
-      left = sign_extend(in1.left, inSize, outSize);
+      if (in1.left == in1.right) {
-      right = sign_extend((in1.right - in1.step)&in1.mask, inSize, outSize);
+	uintb rem = in1.left % step;
-      if ((intb)right < (intb)left) {
-	uintb rem = left % step;
 	right = calc_mask(inSize) >> 1;
 	left = (calc_mask(outSize) ^ right) + rem;
 	right = right + 1 + rem;
       }
-      else
+      else {
-	right += step;
+	left = sign_extend(in1.left, inSize, outSize);
+	right = sign_extend((in1.right - in1.step)&in1.mask, inSize, outSize);
+	if ((intb)right < (intb)left)
+	  return false;	// Extending causes 2 pieces
+ 	right  = (right + step) & mask;
+      }
       break;
     case CPUI_INT_2COMP:
       isempty = false;
@@ -1133,8 +1146,8 @@ bool CircleRange::pushForwardUnary(OpCode opc,const CircleRange &in1,int4 inSize
       isempty = false;
       step = in1.step;
       mask = in1.mask;
-      left = -in1.right & mask;
+      left = (~in1.right + step) & mask;
-      right = -in1.left & mask;
+      right =(~in1.left + step) & mask;
       normalize();
       break;
     case CPUI_BOOL_NEGATE:

Ghidra/Features/Decompiler/src/decompile/unittests/testtypes.cc

@@ -18,10 +18,10 @@
 #include "test.hh"
 #include <iostream>
 
-Architecture *glb;
+static Architecture *glb;
-TypeFactory *types;
+static TypeFactory *types;
-CastStrategy *strategy;
+static CastStrategy *strategy;
-Funcdata *dummyFunc;
+static Funcdata *dummyFunc;
 
 class TypeTestEnvironment {
   Architecture *g;