import sys on rs227, workarounds on disasm and debug print statements on mnembler, HELLO_WORLD.asm

MNEMBLER.py

@@ -175,6 +175,7 @@ def asm_pass_1(filename,base_address=0):
 		if l.strip() != "":
 			(label,ismacroinst,op, indirect_bit, addridx, comment) = decompose_asm(l)
 			if op is not None or label is not None:
+				print(op)
 				if in_macro_name != None:
 					if op == "EMAC":
 						in_macro_name = None
@@ -453,7 +454,7 @@ def asm_pass_1(filename,base_address=0):
 									print("****\%s:%d generated the following error" % (filename,lnum))
 									traceback.print_exc()
 									sys.exit(-1)
-
+							print(op)
 							opcode = (INT_OPCODES[op] << 12) | augment_code
 							program_listing.append((lnum,cur_address,"DATA", LOADER_FORMATS[LITERAL_LOAD][1] | ( LOADER_BITMASKS["X_FLAG"] * x_flag ),lambda x=opcode, y=augment_code, z=cur_address:[parsearg(z,SYMBOLS, y)()|x],supress_output))
 							handled = True

asm/HELLO_WORLD.ASM

@@ -1,3 +1,29 @@
+<<<<<<< HEAD
+     REL
+     SPB  PRNT
+     HLT
+TTY  HLT
+     AOP  1,W
+     LSL  8
+     AOP  1,W
+     BRU* TTY
+CRLF HLT
+     MOP  1,W
+     DATA '106400
+     MOP  1,W
+     DATA '105000
+     BRU* CRLF
+PRNT HLT                            
+     SPB  CRLF
+     LBA  =-6
+     LAA  TBLA+6,1
+     SPB  TTY
+     IBS
+     BRU  *-3
+     BRU* PRNT
+TBLA DATA ''HELLO WORLD!''
+     END
+=======
      REL
      SPB  PRNT
      HLT
@@ -21,3 +47,4 @@ PRNT HLT
      BRU  *-3
      BRU* PRNT
 TBLA DATA ''HELLO WORLD!''
+>>>>>>> upstream/master

rs227.py

@@ -1,5 +1,5 @@
 import struct
-
+import sys
 
 START_CODE = 0xff
 CARRIAGE_RETURN = 0x8d

sel810dis.py

@@ -89,8 +89,8 @@ def SELDISASM(opcode):
 					if nme == "CEU":
 						for a,(n,ch,th) in CEU_TEU_UNITS.items():
 							if unit == a:
-								second_word_hint = (ceu_breakdown,ch)
-
+#								second_word_hint = (ceu_breakdown,ch)
+								second_word_hint = None								
 					elif nme == "TEU":
 						for a,(n,ch,th) in CEU_TEU_UNITS.items():
 							if unit == a: