Implemented object tree navigation in program information dialog

Author: maccasoft

spin-tools/src/main/java/com/maccasoft/propeller/Compiler.java

@@ -323,4 +323,8 @@ public Map<String, List<Token>> getDefines() {
         return defines;
     }
 
+    protected void linkObjects(int memoryOffset, ObjectCompiler objectCompiler) {
+
+    }
+
 }

spin-tools/src/main/java/com/maccasoft/propeller/P1MemoryDialog.java

@@ -191,8 +191,8 @@ Options createOptions() {
         binaryOptions.addOption(new Option("e", false, "output flash binary file (P2 only)"));
         binaryOptions.addOption(new Option("c", false, "output only DAT sections"));
         options.addOptionGroup(binaryOptions);
-        options.addOption(new Option("l", false, "output listing file"));
-        options.addOption(new Option("d", false, "enable debug (P2 only)"));
+        options.addOption(new Option("l", "list", false, "output listing file"));
+        options.addOption(new Option("d", "debug", false, "enable debug (P2 only)"));
         options.addOption(new Option("z", false, "compress binary (P2 only)"));
 
         OptionGroup targetOptions = new OptionGroup();

spin-tools/src/main/java/com/maccasoft/propeller/P2MemoryDialog.java

@@ -362,6 +362,7 @@ public void generateListing(int address, int offset, PrintStream ps) {
     }
 
     File file;
+    int address;
 
     int clkfreq;
     int clkmode;
@@ -376,18 +377,19 @@ public SpinObject() {
 
     }
 
-    public SpinObject(File file) {
+    public SpinObject(File file, int address) {
         this.file = file;
-    }
-
-    public String getName() {
-        return file != null ? file.getName() : null;
+        this.address = address;
     }
 
     public File getFile() {
         return file;
     }
 
+    public int getAddress() {
+        return address;
+    }
+
     public void addChildObject(SpinObject object) {
         for (SpinObject child : childObjects) {
             if (child == object) {

spin-tools/src/main/java/com/maccasoft/propeller/SpinCompiler.java

@@ -84,7 +84,7 @@ public void addDefine(String identifier, String value) {
     public Spin1Object compile(File file, String text) {
         Spin1Object obj = compileObject(file, text);
 
-        Spin1Object object = new Spin1Object(file);
+        Spin1Object object = new Spin1Object(file, 0);
         for (SpinObject child : obj.getChildObjects()) {
             object.addChildObject(child);
         }

spin-tools/src/main/java/com/maccasoft/propeller/SpinObject.java

@@ -62,8 +62,8 @@ public Spin1Object() {
 
     }
 
-    public Spin1Object(File file) {
-        super(file);
+    public Spin1Object(File file, int address) {
+        super(file, address);
     }
 
     public int getDcurr() {

spin-tools/src/main/java/com/maccasoft/propeller/spin1/Spin1Compiler.java

@@ -489,7 +489,7 @@ public int getVarSize() {
 
     @Override
     public Spin1Object generateObject(int memoryOffset) {
-        Spin1Object object = new Spin1Object(getFile());
+        Spin1Object object = new Spin1Object(getFile(), memoryOffset);
 
         object.setClkFreq(clkFreq);
         object.setClkMode(clkMode);

spin-tools/src/main/java/com/maccasoft/propeller/spin1/Spin1Object.java

@@ -103,13 +103,11 @@ Spin2Object compileObject(File file, String text) {
         }
 
         Spin2Object object = objectCompiler.generateObject(memoryOffset);
-        memoryOffset += object.getSize();
 
         for (ObjectInfo info : childObjects) {
             info.offset = object.getSize();
-            info.object = info.compiler.generateObject(memoryOffset);
+            info.object = info.compiler.generateObject(memoryOffset + object.getSize());
             object.writeObject(info.object);
-            memoryOffset += info.object.getSize();
         }
 
         for (ObjectInfo info : childObjects) {

spin-tools/src/main/java/com/maccasoft/propeller/spin1/Spin1ObjectCompiler.java

@@ -95,8 +95,8 @@ public Spin2Object() {
 
     }
 
-    public Spin2Object(File file) {
-        super(file);
+    public Spin2Object(File file, int address) {
+        super(file, address);
     }
 
     public void setClockSetter(boolean clockSetter) {