clean lines/parser

Author: ThroughTheVoid

.gitignore

@@ -1,7 +1,9 @@
 /build
-test.cpu
-test.cpu.asm
 cvm
 vm/main.o
 vm/readfile.o
 *.pyc
+*.asm
+*.ins
+test
+envs

assembler/__main__.py

@@ -22,8 +22,9 @@ def parse_args():
         default=None
     )
 
+
     args = parser.parse_args()
-    
+
     return args
 
 def __main__(): 

assembler/lib/parser.py

@@ -2,59 +2,100 @@
 from instruction import str_to_name
 from instruction import str_to_value
 
+def error(msg):
+	print("[!!] " + msg)
+
 class Parser():
-    # Converts a string to and Instruction
-    def line_to_instruction(self,s):    
-        
-        # Conversion
-        
-        # remove endline
-        words = s.replace("\n","")
-        
-        # shave off comments
-        if ";" in words:
-            words = words.split(";")[0]    
-        
-        words = words.split(" ")
-        
-        # ignore lines with less than 2 words
-        if len(words)<2:
-            return None
-
-        str_name  = words[0].lower()
-        str_value = words[1]
-        num_name  = str_to_name(str_name)
-        num_value = str_to_value(str_value)
-        
-        # Error Checking
-        if num_name is None:
-            error("Invalid Instruction " + str_name)
-            return None
-
-        if num_value is None:
-            error("Invalid Value " + str_value)
-            return None
-        
-        return Instruction(num_name,num_value)
-
-    # Converts a list of strings
-    # to a list of Instructions
-    def lines_to_assembly(self,lines):
-        instr_list = []
-        for line in lines:
-            instr = self.line_to_instruction(line)
-            if instr is not None:
-                instr_list.append(instr)
-        return instr_list
-
-    # Converts a list of instructions
-    # to a list of bytes.
-    def assembly_to_buffer(self,assembly):
-        buf = []
-        for instr in assembly:
-            name = chr(instr.name)
-            value = chr(instr.value)
-            buf.append(name)
-            buf.append(value)
-        return buf
+	# Converts a string to and Instruction
+	def line_to_instruction(self,s):	
+		
+		# Conversion
+		
+		# remove endline
+		words = s.replace("\n","")
+		
+		# shave off comments
+		if ";" in words:
+			words = words.split(";")[0]	
+		
+		words = words.split(" ")
+		
+		# ignore lines with less than 2 words
+		if len(words)<2:
+			return None
+
+		str_name  = words[0].lower()
+		str_value = words[1]
+		num_name  = str_to_name(str_name)
+		num_value = str_to_value(str_value)
+		
+		# Error Checking
+		if num_name is None:
+			error("Invalid Instruction " + str_name)
+			return None
+
+		if num_value is None:
+			error("Invalid Value " + str_value)
+			return None
+		
+		return Instruction(num_name,num_value)
+
+	def split_comma(self,lines):
+		result = []
+		for line in lines:
+			if ',' in line:
+				split_line = line.split(",")
+				for s in split_line:
+					result.append(s)	
+			else:
+				result.append(line)
+		return result
+
+	def remove_trailing_spaces(self,lines):
+		result = []
+		for line in lines:
+			while line[0]==" ":
+				line = line[1:]
+			result.append(line)
+		return result
+	
+	def clean_lines(self, lines):
+		result = []
+		for line in lines:
+			if line[0]==";":
+				continue
+
+			line = line.replace("\n","")
+			line = line.replace("	","")			
+
+			if len(line)>1:
+				result.append(line)
+		return result
+
+	# Converts a list of strings
+	# to a list of Instructions
+	def lines_to_assembly(self,lines):
+		instr_list = []
+		print(lines)
+		lines = self.split_comma(lines)
+		lines = self.remove_trailing_spaces(lines)
+		lines = self.clean_lines(lines)
+		print(lines)
+		for line in lines:
+			instr = self.line_to_instruction(line)
+			if instr is not None:
+				instr_list.append(instr)
+
+		return instr_list
+
+	# Converts a list of instructions
+	# to a list of bytes.
+	def assembly_to_buffer(self,assembly):
+		buf = []
+		for instr in assembly:
+			name = chr(instr.name)
+			value = chr(instr.value)
+			buf.append(name)
+			buf.append(value)
+		return buf
 

vm/main.c

@@ -12,8 +12,9 @@ enum CODES{
 char PROGRAM[256];
 char MEMORY[256];
 char POINTER = 0;
-char INST = 0;
+char INST    = 0;
 char RUNNING = 1;
+int  CYCLES  = 0;
 
 // Maths
 void adda(char v) { MEMORY[POINTER] += MEMORY[v];}
@@ -55,6 +56,7 @@ void interpret(){
 
 void run(){
 	while(RUNNING){
+		CYCLES = CYCLES + 1;
 		interpret();
 	}
 }
@@ -84,6 +86,8 @@ void dump(char height){
 
 	printf("MEMORY = \n");
 
+	printf("CYCLES = %d\n",CYCLES);
+
 	for(x=0;x<height;x++){
 		for(y=0;y<16;y++){
 			printf("%d ",MEMORY[y+(x*16)]);