Fix: unit test fix commit lost (when rebasing?)

uxmal · Oct 17, 2024 · e96bc1a · e96bc1a
1 parent 1ac7657
commit e96bc1a
Show file tree

Hide file tree

Showing 10 changed files with 26 additions and 26 deletions.
diff --git a/src/UnitTests/Decompiler/Analysis/CallRewriterTests.cs b/src/UnitTests/Decompiler/Analysis/CallRewriterTests.cs
@@ -382,7 +382,7 @@ public void CrwRegisterOutArgument()
             flow.BitsLiveOut.Add(Registers.eax, new(BitRange.Empty, proc));        // becomes the return value.
             flow.BitsLiveOut.Add(Registers.ebx, new(BitRange.Empty, proc));
             crw.EnsureSignature(ssa, flow);
-            Assert.AreEqual("Register word32 foo(Register out ptr32 ebxOut)", proc.Signature.ToString(proc.Name));
+            Assert.AreEqual("Register word32 foo(Register out word32 ebxOut)", proc.Signature.ToString(proc.Name));
         }
 
         [Test]
@@ -404,7 +404,7 @@ public void CrwFpuOutArgument()
             flow.BitsLiveOut.Add(new FpuStackStorage(1, PrimitiveType.Real80), new(BitRange.Empty,proc));
 
             crw.EnsureSignature(ssa, flow);
-            Assert.AreEqual("Register word32 foo(FpuStack real80 rArg0, FpuStack out ptr32 rArg0Out, FpuStack out ptr32 rArg1Out)", proc.Signature.ToString(proc.Name));
+            Assert.AreEqual("Register word32 foo(FpuStack real80 rArg0, FpuStack out real80 rArg0Out, FpuStack out real80 rArg1Out)", proc.Signature.ToString(proc.Name));
         }
 
         [Test]
@@ -748,7 +748,7 @@ def r2
 	return
 	// succ:  main_exit
 main_exit:
-Register word32 fnOutParam(Register word32 r1, Register word32 r2, Register out ptr32 r2Out)
+Register word32 fnOutParam(Register word32 r1, Register word32 r2, Register out word32 r2Out)
 // MayUse:  r1:[0..31] r2:[0..31]
 // DataTypes: 
 //   r1: word32
@@ -766,7 +766,7 @@ Register word32 fnOutParam(Register word32 r1, Register word32 r2, Register out
 // r63:r63
 // r2Out:Out:r2
 // return address size: 0
-word32 fnOutParam(word32 r1, word32 r2, ptr32 & r2Out)
+word32 fnOutParam(word32 r1, word32 r2, word32 & r2Out)
 fnOutParam_entry:
 	def r1
 	def r2

diff --git a/src/tests/Analysis/CoaAsciiHex.exp b/src/tests/Analysis/CoaAsciiHex.exp
@@ -117,7 +117,7 @@ Z_68: orig: Z
 Z_69: orig: Z
 // fn0C00_000A
 // Return size: 0
-bool fn0C00_000A(byte al, ptr16 & alOut)
+bool fn0C00_000A(byte al, byte & alOut)
 fn0C00_000A_entry:
 	def al
 	// succ:  l0C00_000A

diff --git a/src/tests/Analysis/CoaSideEffectCalls.exp b/src/tests/Analysis/CoaSideEffectCalls.exp
@@ -37,7 +37,7 @@ bx_5: orig: bx
 bxOut:Out:bx
 // fn0C00_000E
 // Return size: 0
-word16 fn0C00_000E(ptr16 & bxOut)
+word16 fn0C00_000E(word16 & bxOut)
 fn0C00_000E_entry:
 	// succ:  l0C00_000E
 l0C00_000E:

diff --git a/src/tests/Analysis/CrwAsciiHex.exp b/src/tests/Analysis/CrwAsciiHex.exp
@@ -36,7 +36,7 @@ l0C00_0009:
 	return
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
-FlagGroup bool fn0C00_000A(Register byte al, Register out ptr16 alOut)
+FlagGroup bool fn0C00_000A(Register byte al, Register out byte alOut)
 // MayUse:  al:[0..7]
 // DataTypes: 
 //   al: cu8
@@ -59,7 +59,7 @@ FlagGroup bool fn0C00_000A(Register byte al, Register out ptr16 alOut)
 // O:O
 // alOut:Out:al
 // return address size: 2
-bool fn0C00_000A(byte al, ptr16 & alOut)
+bool fn0C00_000A(byte al, byte & alOut)
 fn0C00_000A_entry:
 	def al
 	// succ:  l0C00_000A

diff --git a/src/tests/Analysis/CrwLeakyLiveness.exp b/src/tests/Analysis/CrwLeakyLiveness.exp
@@ -39,7 +39,7 @@ l0C00_0009:
 	return
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
-FlagGroup bool fn0C00_000A(Register selector ds, Register out ptr16 axOut)
+FlagGroup bool fn0C00_000A(Register selector ds, Register out word16 axOut)
 // MayUse:  ds:[0..15]
 // DataTypes: 
 //   ds: (ptr16 (segment 0104))
@@ -64,7 +64,7 @@ FlagGroup bool fn0C00_000A(Register selector ds, Register out ptr16 axOut)
 // O:O
 // axOut:Out:ax
 // return address size: 2
-bool fn0C00_000A(selector ds, ptr16 & axOut)
+bool fn0C00_000A(selector ds, word16 & axOut)
 fn0C00_000A_entry:
 	def ds
 	def Mem0

diff --git a/src/tests/Analysis/CrwMutual.exp b/src/tests/Analysis/CrwMutual.exp
@@ -28,7 +28,7 @@ l0C00_0000:
 	return
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
-Register word16 fn0C00_0004(Register word16 dx, Register out ptr16 dxOut)
+Register word16 fn0C00_0004(Register word16 dx, Register out word16 dxOut)
 // MayUse:  dx:[0..15]
 // DataTypes: 
 //   dx: word16
@@ -52,7 +52,7 @@ Register word16 fn0C00_0004(Register word16 dx, Register out ptr16 dxOut)
 // O:O
 // dxOut:Out:dx
 // return address size: 2
-word16 fn0C00_0004(word16 dx, ptr16 & dxOut)
+word16 fn0C00_0004(word16 dx, word16 & dxOut)
 fn0C00_0004_entry:
 	def dx
 	// succ:  l0C00_0004

diff --git a/src/tests/Analysis/CrwParameters.exp b/src/tests/Analysis/CrwParameters.exp
@@ -44,7 +44,7 @@ l0C00_0000:
 	return
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
-Register word16 fn0C00_0025(Sequence segptr32 ds_si, Register out ptr16 siOut)
+Register word16 fn0C00_0025(Sequence segptr32 ds_si, Register out word16 siOut)
 // MayUse:  Sequence ds:si:[0..31]
 // DataTypes: 
 //   Sequence ds:si: (ptr32 (struct 0002))
@@ -64,7 +64,7 @@ Register word16 fn0C00_0025(Sequence segptr32 ds_si, Register out ptr16 siOut)
 // ds_si:Sequence ds:si
 // siOut:Out:si
 // return address size: 2
-word16 fn0C00_0025(segptr32 ds_si, ptr16 & siOut)
+word16 fn0C00_0025(segptr32 ds_si, word16 & siOut)
 fn0C00_0025_entry:
 	def ds_si
 	si = SLICE(ds_si, word16, 0)
@@ -77,7 +77,7 @@ l0C00_0025:
 	return ax_7
 	// succ:  fn0C00_0025_exit
 fn0C00_0025_exit:
-Register word16 fn0C00_0027(Sequence segptr32 ds_si, Register out ptr16 siOut)
+Register word16 fn0C00_0027(Sequence segptr32 ds_si, Register out word16 siOut)
 // MayUse:  Sequence ds:si:[0..31]
 // DataTypes: 
 //   Sequence ds:si: (ptr32 (struct 0002))
@@ -102,7 +102,7 @@ Register word16 fn0C00_0027(Sequence segptr32 ds_si, Register out ptr16 siOut)
 // ds_si:Sequence ds:si
 // siOut:Out:si
 // return address size: 2
-word16 fn0C00_0027(segptr32 ds_si, ptr16 & siOut)
+word16 fn0C00_0027(segptr32 ds_si, word16 & siOut)
 fn0C00_0027_entry:
 	def ds_si
 	si = SLICE(ds_si, word16, 0)
@@ -124,7 +124,7 @@ l0C00_002E:
 	return ax_18
 	// succ:  fn0C00_0027_exit
 fn0C00_0027_exit:
-Register word16 fn0C00_002F(Sequence segptr32 ds_si, Register out ptr16 siOut)
+Register word16 fn0C00_002F(Sequence segptr32 ds_si, Register out word16 siOut)
 // MayUse:  Sequence ds:si:[0..31]
 // DataTypes: 
 //   Sequence ds:si: (ptr32 (struct 0006))
@@ -144,7 +144,7 @@ Register word16 fn0C00_002F(Sequence segptr32 ds_si, Register out ptr16 siOut)
 // ds_si:Sequence ds:si
 // siOut:Out:si
 // return address size: 2
-word16 fn0C00_002F(segptr32 ds_si, ptr16 & siOut)
+word16 fn0C00_002F(segptr32 ds_si, word16 & siOut)
 fn0C00_002F_entry:
 	def ds_si
 	si = SLICE(ds_si, word16, 0)
@@ -158,7 +158,7 @@ l0C00_002F:
 	return ax_7
 	// succ:  fn0C00_002F_exit
 fn0C00_002F_exit:
-Register word16 fn0C00_0036(Sequence segptr32 ds_si, Register out ptr16 siOut)
+Register word16 fn0C00_0036(Sequence segptr32 ds_si, Register out word16 siOut)
 // MayUse:  Sequence ds:si:[0..31]
 // DataTypes: 
 //   Sequence ds:si: segptr32
@@ -178,7 +178,7 @@ Register word16 fn0C00_0036(Sequence segptr32 ds_si, Register out ptr16 siOut)
 // ds_si:Sequence ds:si
 // siOut:Out:si
 // return address size: 2
-word16 fn0C00_0036(segptr32 ds_si, ptr16 & siOut)
+word16 fn0C00_0036(segptr32 ds_si, word16 & siOut)
 fn0C00_0036_entry:
 	def ds_si
 	ds = SLICE(ds_si, selector, 16)

diff --git a/src/tests/Analysis/DfaAsciiHex.exp b/src/tests/Analysis/DfaAsciiHex.exp
@@ -20,15 +20,15 @@ l0C00_0009:
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
 
-// FlagGroup bool fn0C00_000A(Register byte al, Register out ptr16 alOut)
+// FlagGroup bool fn0C00_000A(Register byte al, Register out byte alOut)
 // stackDelta: 2; fpuStackDelta: 0; fpuMaxParam: -1
 // MayUse:  al:[0..7]
 // LiveOut: C-fn0C00_0000 al:[0..7]-fn0C00_0000
 // Trashed: SCZO al Top
 // Preserved: sp
 // fn0C00_000A
 // Return size: 0
-bool fn0C00_000A(byte al, ptr16 & alOut)
+bool fn0C00_000A(byte al, byte & alOut)
 fn0C00_000A_entry:
 	// succ:  l0C00_000A
 l0C00_000A:

diff --git a/src/tests/Analysis/DfaMutualTest.exp b/src/tests/Analysis/DfaMutualTest.exp
@@ -15,15 +15,15 @@ l0C00_0000:
 	// succ:  fn0C00_0000_exit
 fn0C00_0000_exit:
 
-// Register word16 fn0C00_0004(Register word16 dx, Register out ptr16 dxOut)
+// Register word16 fn0C00_0004(Register word16 dx, Register out word16 dxOut)
 // stackDelta: 2; fpuStackDelta: 0; fpuMaxParam: -1
 // MayUse:  dx:[0..15]
 // LiveOut: ax:[0..15]-fn0C00_0013 dx:[0..15]-fn0C00_0013
 // Trashed: SCZO ax dx Top
 // Preserved: sp
 // fn0C00_0004
 // Return size: 0
-word16 fn0C00_0004(word16 dx, ptr16 & dxOut)
+word16 fn0C00_0004(word16 dx, word16 & dxOut)
 fn0C00_0004_entry:
 	// succ:  l0C00_0004
 l0C00_0004:

diff --git a/src/tests/Structure/CccAsciiHex.exp b/src/tests/Structure/CccAsciiHex.exp
@@ -32,7 +32,7 @@ fn0C00_0000_exit:
 ================
 // fn0C00_000A
 // Return size: 0
-bool fn0C00_000A(byte al, ptr16 & alOut)
+bool fn0C00_000A(byte al, byte & alOut)
 fn0C00_000A_entry:
 	// succ:  l0C00_000A
 l0C00_000A:
@@ -76,7 +76,7 @@ fn0C00_000A_exit:
 
 // fn0C00_000A
 // Return size: 0
-bool fn0C00_000A(byte al, ptr16 & alOut)
+bool fn0C00_000A(byte al, byte & alOut)
 fn0C00_000A_entry:
 	// succ:  l0C00_000A
 l0C00_000A: