Allow makeAlignment to make larger chunks

CERTCC · Nov 14, 2024 · ff52f4c · ff52f4c
1 parent a2ba4f7
commit ff52f4c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/kaiju/tools/disasm/DisasmStrategy.java b/src/main/java/kaiju/tools/disasm/DisasmStrategy.java
@@ -66,14 +66,14 @@ public interface DisasmStrategy extends KaijuLogger {
      * this is a default implementation that shouldn't rely on
      * architecture, but can be overriden if needed for some reason.
      */
-    default Pair<AddressRange, Integer> makeAlignment(Listing listing, final Address address, TaskMonitor monitor) {
+    default Pair<AddressRange, Integer> makeAlignment(Listing listing, final Address address, long length, TaskMonitor monitor) {
         DataType alignmentType = GhidraTypeUtilities.findGhidraType("Alignment");
         try {
-            Data alignData = listing.createData(address, alignmentType);
+            Data alignData = listing.createData(address, alignmentType, (int) length);
             final Address minAddr = alignData.getMinAddress();
             final Address maxAddr = alignData.getMaxAddress();
             final AddressRange range = new AddressRangeImpl(minAddr, maxAddr);
-            debug(this, "Created alignment at: " + range);
+            debug(this, "Created alignment of " + range.getLength() + " bytes at: " + range);
             //alignmentAddresses.add(range);
             return new Pair<AddressRange, Integer>(range, 1);
         } catch (final CodeUnitInsertionException e) {

diff --git a/src/main/java/kaiju/tools/disasm/impl/X86ImproverStrategy.java b/src/main/java/kaiju/tools/disasm/impl/X86ImproverStrategy.java
@@ -90,13 +90,13 @@ public Pair<AddressRange, Integer> analyzeGap(final AddressRange range) {
         switch (previousBlockType) {
             case CODE:
                 if (b == 0xCC) {
-                    return makeAlignment(listing, minAddr, monitor);
+                    return makeAlignment(listing, minAddr, range.getLength(), monitor);
                 } else {
                     return makeCode(currentProgram, listing, minAddr, monitor);
                 }
             case DATA:
                 if (b == 0x00)
-                    return makeAlignment(listing, minAddr, monitor);
+                    return makeAlignment(listing, minAddr, range.getLength(), monitor);
                 break;
             case ALIGNMENT:
                 debug(this, "I'm a little surprised to find alignment at " + minAddr);