Added support for align_(pri|alt) OPcodes

src/main/java/lysis/BitConverter.java

@@ -23,6 +23,15 @@ public static int ToInt32(byte[] bytes, int offset) {
 		return result;
 	}
 
+	public static int ToInt32LittleEndian(byte[] bytes, int offset) {
+	    int result = (int) bytes[offset + 3] & 0xff;
+	    result |= ((int) bytes[offset + 2] & 0xff) << 8;
+	    result |= ((int) bytes[offset + 1] & 0xff) << 16;
+	    result |= ((int) bytes[offset] & 0xff) << 24;
+	    return result;
+	}
+
+
 	public static long ToUInt32(byte[] bytes, int offset) {
 		long result = (int) bytes[offset] & 0xff;
 		result |= ((int) bytes[offset + 1] & 0xff) << 8;

src/main/java/lysis/builder/MethodParser.java

@@ -72,6 +72,7 @@
 import lysis.instructions.LZeroGlobal;
 import lysis.instructions.LZeroLocal;
 import lysis.instructions.SwitchCase;
+import lysis.instructions.LAlign;
 import lysis.lstructure.Function;
 import lysis.lstructure.LBlock;
 import lysis.lstructure.LGraph;
@@ -117,6 +118,11 @@ private long readUInt32() {
 		return BitConverter.ToUInt32(file_.code().bytes(), (int) pc_ - 4);
 	}
 
+	private int readInt32LittleEndian() {
+	    pc_ += 4;
+	    return BitConverter.ToInt32LittleEndian(file_.code().bytes(), (int) pc_ - 4);
+	}
+
 	private SPOpcode readOp() {
 		return SPOpcode.values()[(int) readUInt32()];
 	}
@@ -227,6 +233,13 @@ private LInstruction readInstruction(SPOpcode op) throws Exception {
 		case idxaddr_b:
 			return new LIndexAddress(readInt32());
 
+		case align_pri:
+		case align_alt:
+		{
+			Register reg = (op == SPOpcode.align_pri) ? Register.Pri : Register.Alt;
+			return new LAlign(trackGlobal(readInt32LittleEndian()), reg);
+		}
+
 		case move_pri:
 		case move_alt: {
 			Register reg = (op == SPOpcode.move_pri) ? Register.Pri : Register.Alt;

src/main/java/lysis/builder/SourceBuilder.java

@@ -26,6 +26,7 @@
 import lysis.nodes.NodeBlock;
 import lysis.nodes.NodeList;
 import lysis.nodes.NodeType;
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoolean;
@@ -410,6 +411,10 @@ private String buildLoadStoreRef(DNode node) throws Exception {
 		case Unary: {
 			return buildUnary((DUnary) node) + "/* ERROR unknown load Unary */";
 		}
+
+		case Align: {
+			return buildAlign((DAlign) node);
+		}
 
 		default:
 			throw new Exception("unknown load " + node.type());
@@ -419,6 +424,10 @@ private String buildLoadStoreRef(DNode node) throws Exception {
 	private String buildLoad(DLoad load) throws Exception {
 		return buildLoadStoreRef(load.getOperand(0));
 	}
+
+	private String buildAlign(DAlign alg) throws Exception {
+		return buildLoadStoreRef(alg.getOperand(0));
+	}
 
 	private String buildSysReq(DSysReq sysreq) throws Exception {
 		String args = "";
@@ -813,6 +822,9 @@ private void writeStatement(DNode node) throws Exception {
 		case Label:
 			writeLabel((DLabel) node);
 			break;
+
+		case Align:
+			break;
 
 		default:
 			throw new Exception("unknown op (" + node.type() + ")");

src/main/java/lysis/instructions/LAlign.java

@@ -0,0 +1,29 @@
+package lysis.instructions;
+
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+import lysis.lstructure.Register;
+
+public class LAlign extends LInstructionRegStack {
+
+    private long number_;
+
+    public long number() {
+        return number_;
+    }
+    public LAlign(long number, Register reg) {
+        super(reg, number);
+        number_ = number;
+    }
+
+    @Override
+    public Opcode op() {
+        return Opcode.Align;
+    }
+
+    @Override
+    public void print(DataOutputStream tw) throws IOException {
+        tw.writeBytes("align." + (reg() == Register.Pri ? RegisterName(Register.Pri) : RegisterName(Register.Alt)) + number());
+    }
+}

src/main/java/lysis/instructions/Opcode.java

@@ -1,5 +1,5 @@
 package lysis.instructions;
 
 public enum Opcode {
-	LoadLocal, StoreLocal, LoadLocalRef, StoreLocalRef, Load, Constant, StackAddress, Store, IndexAddress, Move, PushReg, PushConstant, Pop, Stack, Return, Jump, JumpCondition, AddConstant, MulConstant, ZeroGlobal, IncGlobal, DecGlobal, IncLocal, DecLocal, IncI, IncReg, DecI, DecReg, Fill, Bounds, SysReq, Swap, PushStackAddress, DebugBreak, Goto, PushLocal, Exchange, Binary, ShiftLeftConstant, PushGlobal, StoreGlobal, LoadGlobal, Call, EqualConstant, LoadIndex, Unary, StoreGlobalConstant, StoreLocalConstant, ZeroLocal, Heap, MemCopy, Switch, GenArray, StackAdjust, LoadCtrl, StoreCtrl, InitArray
+	LoadLocal, StoreLocal, LoadLocalRef, StoreLocalRef, Load, Constant, StackAddress, Store, IndexAddress, Move, PushReg, PushConstant, Pop, Stack, Return, Jump, JumpCondition, AddConstant, MulConstant, ZeroGlobal, IncGlobal, DecGlobal, IncLocal, DecLocal, IncI, IncReg, DecI, DecReg, Fill, Bounds, SysReq, Swap, PushStackAddress, DebugBreak, Goto, PushLocal, Exchange, Binary, ShiftLeftConstant, PushGlobal, StoreGlobal, LoadGlobal, Call, EqualConstant, LoadIndex, Unary, StoreGlobalConstant, StoreLocalConstant, ZeroLocal, Heap, MemCopy, Switch, GenArray, StackAdjust, LoadCtrl, StoreCtrl, InitArray, Align
 }

src/main/java/lysis/nodes/NodeBuilder.java

@@ -58,13 +58,15 @@
 import lysis.instructions.LUnary;
 import lysis.instructions.LZeroGlobal;
 import lysis.instructions.LZeroLocal;
+import lysis.instructions.LAlign;
 import lysis.instructions.Opcode;
 import lysis.lstructure.Function;
 import lysis.lstructure.LBlock;
 import lysis.lstructure.LGraph;
 import lysis.lstructure.Register;
 import lysis.lstructure.Scope;
 import lysis.lstructure.Variable;
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoundsCheck;
@@ -386,6 +388,15 @@ public void traverse(NodeBlock block) throws Exception {
 				block.add(node);
 				break;
 			}
+
+			case Align: {
+				LAlign ins = (LAlign) uins;
+				DAlign node = new DAlign((ins.reg() == Register.Pri) ? block.stack().pri() : block.stack().alt(), ins.number());
+
+				block.stack().set((ins.reg() == Register.Pri) ? Register.Pri : Register.Alt, node);
+				block.add(node);
+				break;
+			}
 
 			case Move: {
 				LMove ins = (LMove) uins;

src/main/java/lysis/nodes/NodeRewriter.java

@@ -1,5 +1,6 @@
 package lysis.nodes;
 
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoundsCheck;
@@ -291,6 +292,10 @@ public void visit(DCall call) throws Exception {
 			throw new Exception("unknown spop");
 		}
 	}
+
+	@Override
+	public void visit(DAlign check) {
+	}
 
 	private void rewriteBlock(NodeBlock block) throws Exception {
 		current_ = block;

src/main/java/lysis/nodes/NodeType.java

@@ -1,5 +1,5 @@
 package lysis.nodes;
 
 public enum NodeType {
-	Sentinel, Constant, DeclareLocal, DeclareStatic, LocalRef, Jump, JumpCondition, SysReq, Binary, BoundsCheck, ArrayRef, Store, Load, Return, Global, String, Boolean, Float, Function, Character, Call, TempName, Phi, Unary, IncDec, Heap, MemCopy, InlineArray, Switch, GenArray, Label
+	Sentinel, Constant, DeclareLocal, DeclareStatic, LocalRef, Jump, JumpCondition, SysReq, Binary, BoundsCheck, ArrayRef, Store, Load, Return, Global, String, Boolean, Float, Function, Character, Call, TempName, Phi, Unary, IncDec, Heap, MemCopy, InlineArray, Switch, GenArray, Label, Align
 }

src/main/java/lysis/nodes/NodeVisitor.java

@@ -1,5 +1,6 @@
 package lysis.nodes;
 
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoolean;
@@ -117,4 +118,7 @@ public void visit(DGenArray genarray) throws Exception {
 
 	public void visit(DLabel gototarget) {
 	}
+
+	public void visit(DAlign number) {
+	}
 }

src/main/java/lysis/nodes/types/DAlign.java

@@ -0,0 +1,33 @@
+package lysis.nodes.types;
+
+import lysis.nodes.NodeType;
+import lysis.nodes.NodeVisitor;
+
+public class DAlign extends DUnaryNode {
+
+	private long amount_;
+
+	public DAlign(DNode index, long amount) throws Exception {
+		super(index);
+		amount_ = amount;
+	}
+
+	public long amount() {
+		return amount_;
+	}
+
+	@Override
+	public NodeType type() {
+		return NodeType.Align;
+	}
+
+	@Override
+	public void accept(NodeVisitor visitor) {
+		visitor.visit(this);
+	}
+
+	@Override
+	public boolean guard() {
+		return true;
+	}
+}

src/main/java/lysis/types/BackwardTypePropagation.java

@@ -15,6 +15,7 @@
 import lysis.nodes.NodeList;
 import lysis.nodes.NodeType;
 import lysis.nodes.NodeVisitor;
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoolean;
@@ -401,4 +402,7 @@ public void visit(DGenArray genarray) throws Exception {
 			genarray.getOperand(i).accept(this);
 		}
 	}
+
+	public void visit(DAlign check) {
+	}
 }

src/main/java/lysis/types/ForwardTypePropagation.java

@@ -9,6 +9,7 @@
 import lysis.nodes.NodeList;
 import lysis.nodes.NodeType;
 import lysis.nodes.NodeVisitor;
+import lysis.nodes.types.DAlign;
 import lysis.nodes.types.DArrayRef;
 import lysis.nodes.types.DBinary;
 import lysis.nodes.types.DBoundsCheck;
@@ -293,4 +294,8 @@ public void visit(DGenArray genarray) throws Exception {
 			genarray.addType(new TypeUnit(tu));
 		}
 	}
+
+	@Override
+	public void visit(DAlign node) {
+	}
 }