Fix: bug in SliceMem_Rule, reported by @ptomin.

uxmal · Jan 15, 2024 · 42463e0 · 42463e0
1 parent 331c6ba
commit 42463e0
Show file tree

Hide file tree

Showing 20 changed files with 593 additions and 594 deletions.
diff --git a/src/Decompiler/Evaluation/SliceMem_Rule.cs b/src/Decompiler/Evaluation/SliceMem_Rule.cs
@@ -59,7 +59,7 @@ public SliceMem_Rule()
 			if (0 <= bitBegin && bitEnd <= acc.DataType.BitSize)
 			{
                 //$REVIEW: endianness?
-                offset = op.ApplyConstants(offset.DataType, offset, Constant.Create(ea.DataType, slice.Offset / ctx.MemoryGranularity));
+                offset = op.ApplyConstants(offset.DataType, offset, Constant.Create(offset.DataType, slice.Offset / ctx.MemoryGranularity));
                 Expression newEa = new BinaryExpression(op, offset.DataType, ea, offset);
                 if (segptr is not null)
                 {

diff --git a/subjects/Elf/AVR32/ls.reko/ls.h b/subjects/Elf/AVR32/ls.reko/ls.h
diff --git a/subjects/Elf/AVR32/ls.reko/ls_seg00001000_0000.dis b/subjects/Elf/AVR32/ls.reko/ls_seg00001000_0000.dis
diff --git a/subjects/Elf/x86-64/ls/ls.reko/ls.h b/subjects/Elf/x86-64/ls/ls.reko/ls.h
diff --git a/subjects/Elf/x86-64/ls/ls.reko/ls_text.dis b/subjects/Elf/x86-64/ls/ls.reko/ls_text.dis
diff --git a/subjects/MZ-x86/BENCHFN.h b/subjects/MZ-x86/BENCHFN.h
diff --git a/subjects/MZ-x86/BENCHFN_0800.dis b/subjects/MZ-x86/BENCHFN_0800.dis
diff --git a/subjects/MachO/amd64/MachO-OSX-x64-ls.reko/MachO-OSX-x64-ls.h b/subjects/MachO/amd64/MachO-OSX-x64-ls.reko/MachO-OSX-x64-ls.h
diff --git a/subjects/MachO/amd64/MachO-OSX-x64-ls.reko/MachO-OSX-x64-ls_TEXT_text.dis b/subjects/MachO/amd64/MachO-OSX-x64-ls.reko/MachO-OSX-x64-ls_TEXT_text.dis
diff --git a/subjects/OpenRISC/sunxi/blob.reko/blob.dis b/subjects/OpenRISC/sunxi/blob.reko/blob.dis
diff --git a/subjects/OpenRISC/sunxi/blob.reko/blob.h b/subjects/OpenRISC/sunxi/blob.reko/blob.h