Added .org directive

Author: azertyfun

src/tk/azertyfun/dcputoolchain/AssemblerManager.java

@@ -100,7 +100,7 @@ public boolean assemble() {
 			System.out.print("Optimizing... ");
 			start = System.currentTimeMillis();
 
-			FinalOptimizer finalOptimizer = new FinalOptimizer(tokens, optimize_shortLiterals);
+			FinalOptimizer finalOptimizer = new FinalOptimizer(sourceManager, tokens, optimize_shortLiterals);
 			finalOptimizer.optimize();
 
 			System.out.println("Done in " + (System.currentTimeMillis() - start) + " ms.");

src/tk/azertyfun/dcputoolchain/assembler/FinalOptimizer.java

@@ -2,19 +2,23 @@
 
 import tk.azertyfun.dcputoolchain.assembler.arguments.ArgumentOptimizable;
 import tk.azertyfun.dcputoolchain.assembler.exceptions.ParsingException;
+import tk.azertyfun.dcputoolchain.assembler.sourceManagement.SourceManager;
 
 import java.util.HashMap;
 import java.util.LinkedList;
 
 public class FinalOptimizer {
 
+	private SourceManager sourceManager;
+
 	private LinkedList<Token> tokens;
 
 	private HashMap<String, Character> labelToValue = new HashMap<>();
 
 	private boolean optimizeShortLiterals;
 
-	public FinalOptimizer(LinkedList<Token> tokens, boolean optimizeShortLiterals) {
+	public FinalOptimizer(SourceManager sourceManager, LinkedList<Token> tokens, boolean optimizeShortLiterals) {
+		this.sourceManager = sourceManager;
 		this.tokens = tokens;
 		this.optimizeShortLiterals = optimizeShortLiterals;
 	}
@@ -38,8 +42,8 @@ public void optimize() throws ParsingException {
 			}
 			for (Token token : tokens) {
 				if (!token.isDat() && !token.isLabel()) {
-					token.getA().makeValueLiteral(labelToValue);
-					token.getB().makeValueLiteral(labelToValue);
+					token.getA().makeValueLiteral(labelToValue, sourceManager.getOffset());
+					token.getB().makeValueLiteral(labelToValue, sourceManager.getOffset());
 				} else if(token.isDat()) {
 					token.makeDatValueLiteral(labelToValue);
 				}

src/tk/azertyfun/dcputoolchain/assembler/Preprocessor.java

@@ -33,6 +33,12 @@ public void processDefines() throws ParsingException {
 				else
 					throw new ParsingException("Error: Excpected 2 arguments for magic directive, got " + (splitted.length - 1) + " at " + line.getFile() + ":" + line.getLine() + " (" + line.getOriginal_line() + ")");
 				line.setLine(""); //Set the line for deletion
+			} else if(splitted[0].equalsIgnoreCase(".org") || splitted[0].equalsIgnoreCase("#org")) {
+				if(splitted.length == 2)
+					sourceManager.setOffset(Parser.parseNumber(splitted[1], line));
+				else
+					throw new ParsingException("Error: Expected 1 arguments for org directive, got " + (splitted.length - 1) + " at " + line.getFile() + ":" + line.getLine() + " (" + line.getOriginal_line() + ")");
+				line.setLine(""); //Set the line for deletion
 			}
 		}
 

src/tk/azertyfun/dcputoolchain/assembler/arguments/Argument.java

@@ -7,10 +7,10 @@
 public abstract class Argument {
 	protected Value value = new Value('\0');
 
-	public void makeValueLiteral(HashMap<String, Character> labels) throws ParsingException {
+	public void makeValueLiteral(HashMap<String, Character> labels, char offset) throws ParsingException {
 		if(!value.isLiteral) {
 			if(labels.containsKey(value.label.toUpperCase()))
-				value.literal = labels.get(value.label.toUpperCase());
+				value.literal = (char) (labels.get(value.label.toUpperCase()) + offset);
 			else
 				throw new ParsingException("Error: Can't find label declaration for " + value.label);
 			//value.isLiteral = true;

src/tk/azertyfun/dcputoolchain/assembler/sourceManagement/SourceManager.java

@@ -13,6 +13,8 @@ public class SourceManager {
 	private LinkedList<Label> labels = new LinkedList<>();
 	private HashMap<Character, Character> magic = new HashMap<>();
 
+	private char offset = 0;
+
 	public SourceManager() {
 
 	}
@@ -60,6 +62,10 @@ public void addMagic(char location, char magic) {
 		this.magic.put(location, magic);
 	}
 
+	public void setOffset(char offset) {
+		this.offset = offset;
+	}
+
 	public LinkedList<String> getS_labels() {
 		return s_labels;
 	}
@@ -81,4 +87,8 @@ public String toString() {
 	public HashMap<Character, Character> getMagic() {
 		return magic;
 	}
+
+	public char getOffset() {
+		return offset;
+	}
 }