@@ -7,18 +7,24 @@
 
 import java.io.*;
 import IR.*;
+import helper.Label;
 import symboltable.Variable;
 import java.util.List;
+import java.util.Hashtable;
 
 public class CodeGenerator
 {
 	private String output;
 	private List<Quadruple> IRList;
+	private Hashtable<Quadruple, List<Label>> labels;
+	private List<Variable> varList;
 
-	public CodeGenerator(List<Quadruple> list, String fileName)
+	public CodeGenerator(List<Quadruple> list, Hashtable<Quadruple, List<Label>> label, List<Variable> vars, String fileName)
 	{
 		IRList = list;
 		output = fileName;
+		labels = label;
+		varList = vars;
 	}
 
 	public void generateMIPS()
@@ -28,6 +34,13 @@ public void generateMIPS()
 			FileWriter fw = new FileWriter(output);
 			BufferedWriter bw = new BufferedWriter(fw);
 
+			//Allocated Variables
+			bw.write(".data\n");
+			generateDataSeg(varList, bw);
+			
+			bw.write(".text\n", 0, 6);
+			bw.write("main:\n", 0, 6);
+			
 			//Iterate through the IR instructions
 			for(int i = 0; i < IRList.size(); i++)
 			{
@@ -49,6 +62,36 @@ public void generateMIPS()
 		}
 	}
 
+	private void generateDataSeg(List<Variable> varList, BufferedWriter bw)
+	{
+		for(int i = 0; i < varList.size(); i++)
+		{
+			try
+			{
+				String name = varList.get(i).getName();
+				String type = varList.get(i).getType();
+				String value = "";
+				
+				if(type.equals("int") || type.equals("boolean"))
+				{
+					type = ".word";
+					value = "0"; //Default value of 0d or false
+				}
+				else //Don't handle objects or int[] yet
+				{
+					return;
+				}
+				
+				String data = name + ": " + type + " " + value + "\n";
+				bw.write(data, 0, data.length());
+			}
+			catch (IOException e)
+			{
+				e.printStackTrace();
+			}
+		}
+	}
+	
 	private void functionCall(List<Quadruple>IRList, int index, BufferedWriter bw)
 	{
 		try
@@ -57,11 +100,32 @@ private void functionCall(List<Quadruple>IRList, int index, BufferedWriter bw)
 			int paramCount = Integer.parseInt((String)instruction.getArg2());
 
 			//Store $ra on stack
-			String temp = "addi $sp, $sp, -4\n";
+			String temp = "addi $sp, $sp, -68\n";  //Make enough space on stack to save all reg
 			bw.write(temp, 0, temp.length());
-			temp = "sw $ra, ($sp)\n";
+			temp = "sw $ra, 64($sp)\n";
 			bw.write(temp, 0, temp.length());
 
+			//Store $a0 - $a3 on stack
+			for(int i = 0; i < 4; i++)
+			{
+				temp = "sw $a" + i + ", " + (60 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
+			//Store $t0-$t9 on the stack
+			for(int i = 0; i < 10; i++)
+			{
+				temp = "sw $t" + i + ", " + (44 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
+			//Store $v0-$v1 on the stack
+			for(int i = 0; i < 2; i++)
+			{
+				temp = "sw $v" + i + ", " + (4 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
 			//Store the (up to 4) params in register
 			if(paramCount > 4)
 			{
@@ -92,10 +156,31 @@ private void functionCall(List<Quadruple>IRList, int index, BufferedWriter bw)
 			temp = "jal " + function + "\n";
 			bw.write(temp, 0, temp.length());
 
-			//Restore $ra from stack
-			temp = "lw $ra, ($sp)\n";
+			//Restore $v0-$v1 from the stack
+			for(int i = 1; i >= 0; i--)
+			{
+				temp = "lw $v" + i + ", " + (4 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
+			//Restore $t0-$t9 from the stack
+			for(int i = 9; i >= 0; i--)
+			{
+				temp = "lw $t" + i + ", " + (44 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
+			//Restore $a0-$a3 on the stack
+			for(int i = 3; i >= 0; i--)
+			{
+				temp = "lw $a" + i + ", " + (60 - (4*i)) + "($sp)\n";
+				bw.write(temp, 0, temp.length());
+			}
+			
+			//Restore $ra from the stack
+			temp = "lw $ra, 64($sp)\n";
 			bw.write(temp, 0, temp.length());
-			temp = "addi $sp, $sp, 4\n";
+			temp = "addi $sp, $sp, 68\n";    //Cleanup space on stack from all saved reg
 			bw.write(temp, 0, temp.length());
 		}
 		catch (IOException e)