Unifier.IsCompatibleWithPointer: add missing brackets around (Domain.…

…Selector | Domain.Pointer)
uxmal · Dec 12, 2023 · ba91740 · ba91740
1 parent 434ab82
commit ba91740
Show file tree

Hide file tree

Showing 138 changed files with 132,991 additions and 102,719 deletions.
diff --git a/src/Core/Types/Unifier.cs b/src/Core/Types/Unifier.cs
@@ -214,7 +214,7 @@ private bool IsCompatibleWithPointer(Pointer ptrA, DataType b, int depth)
             }
             if (b is PrimitiveType pb)
             {
-                if ((pb.Domain & Domain.Selector | Domain.Pointer) != 0 && pb.Size == ptrA.Size)
+                if ((pb.Domain & (Domain.Selector | Domain.Pointer)) != 0 && pb.Size == ptrA.Size)
                     return true;
             }
             return false;

diff --git a/src/UnitTests/Decompiler/Evaluation/IdConstantTests.cs b/src/UnitTests/Decompiler/Evaluation/IdConstantTests.cs
@@ -99,11 +99,12 @@ public void Idc_ConstantReferencePointerToInt()
             var ctx = new Mock<EvaluationContext>();
             ctx.Setup(c => c.GetValue(edx)).Returns(Constant.Int32(0x567));
 
-            IdConstant ic = new IdConstant(); 
-            var e = ic.Match(edx, ctx.Object, new Unifier(null, null), listener);
+            IdConstant ic = new IdConstant();
+            var factory = new TypeFactory();
+            var e = ic.Match(edx, ctx.Object, new Unifier(factory, null), listener);
             Assert.That(e, Is.Not.Null);
-            Assert.AreEqual("00000567", e.ToString());
-            Assert.AreEqual("(ptr32 int32)", e.DataType.ToString());
+            Assert.AreEqual("0x567<32>", e.ToString());
+            Assert.AreEqual("(union (int32 u0) (INTPTR u1))", e.DataType.ToString());
         }
 
         [Test]

diff --git a/src/UnitTests/Decompiler/Typing/TypedExpressionRewriterTests.cs b/src/UnitTests/Decompiler/Typing/TypedExpressionRewriterTests.cs
@@ -802,8 +802,8 @@ define proc1
 proc1_entry:
 	// succ:  l1
 l1:
-	eax2 = *eax1
-	eax3 = *eax2
+	eax2 = (real32 **) *eax1
+	eax3 = (real32 *) *eax2
 	g_r1004 = *eax3
 proc1_exit:
 

diff --git a/subjects/Archives/ArTar/hello.reko/hello_O1.h b/subjects/Archives/ArTar/hello.reko/hello_O1.h
diff --git a/subjects/Archives/ArTar/hello.reko/hello_O1_init_array.c b/subjects/Archives/ArTar/hello.reko/hello_O1_init_array.c
diff --git a/subjects/Archives/ArTar/hello.reko/hello_O1_text.c b/subjects/Archives/ArTar/hello.reko/hello_O1_text.c
diff --git a/subjects/CPM-80/CB80_code.c b/subjects/CPM-80/CB80_code.c