diff --git a/src/com/bytezone/diskbrowser/applefile/MerlinSource.java b/src/com/bytezone/diskbrowser/applefile/MerlinSource.java index 3175ea0..c222fe2 100644 --- a/src/com/bytezone/diskbrowser/applefile/MerlinSource.java +++ b/src/com/bytezone/diskbrowser/applefile/MerlinSource.java @@ -19,11 +19,12 @@ public class MerlinSource extends AbstractFile } // Source : Dos binary file - public MerlinSource (String name, byte[] buffer) + public MerlinSource (String name, byte[] buffer, int loadAddress) { super (name, buffer); this.eof = 0; this.recordLength = 0; + this.loadAddress = loadAddress; } @Override @@ -38,7 +39,10 @@ public class MerlinSource extends AbstractFile text.append (String.format ("EOF (aux) : %,8d%n", eof)); } else - text.append (String.format ("Buffer size : %,8d%n", buffer.length)); + { + text.append (String.format ("Buffer size : %04X %<,8d%n", buffer.length)); + text.append (String.format ("Load address : %04X %<,8d%n", loadAddress)); + } text.append ("\n"); ptr = 0; diff --git a/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java b/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java index 5f9a71d..01b2327 100644 --- a/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java +++ b/src/com/bytezone/diskbrowser/dos/AbstractCatalogEntry.java @@ -201,7 +201,7 @@ abstract class AbstractCatalogEntry implements AppleFileSource else if (ShapeTable.isShapeTable (exactBuffer)) appleFile = new ShapeTable (name, exactBuffer); else if (name.endsWith (".S")) - appleFile = new MerlinSource (name, exactBuffer); + appleFile = new MerlinSource (name, exactBuffer, loadAddress); else if (HiResImage.isGif (exactBuffer)) // buffer? appleFile = new OriginalHiResImage (name, exactBuffer, loadAddress); else if (HiResImage.isPng (exactBuffer)) // buffer?