Commit: 9433a4bcc4f35714aa97e50c0945d52010702eaa - em_gb_asm (git)

Emily's Z80 assembler for the Gameboy.

Commit MetaInfo

• Revisión: 9433a4bcc4f35714aa97e50c0945d52010702eaa (tree)
• Tiempo: 2021-02-05 11:21:56
• Autor: AlaskanEmily <emily@alas...>
• Commiter: AlaskanEmily

Log Message

Add expression evaluation for !equ directives

Cambiar Resumen

• modified: em_gb_asm.py

Diferencia incremental

--- a/em_gb_asm.py
+++ b/em_gb_asm.py
@@ -532,7 +532,7 @@ def writeOpcode(mnemonic, block, ops, i, operands):
         if operand[0] == '{' and operand[-1] == '}':
             # Evaluate expression.
             num = block.eval(operand[1:-1])
-            print("INFO: Evaluated " + operand[1:-1] + " as " + hex(num))
+            # print("INFO: Evaluated " + operand[1:-1] + " as " + hex(num))
         else:
             if operand[0] in "<>=":
                 c = operand[0]
@@ -609,7 +609,10 @@ def assemble(block, mnemonic, operands=()):
         return
     
     if mnemonic == "!equ" or mnemonic == "!set":
-        block.equ[operands[0]] = operands[1]
+        if operands[1][0] == '{' and operands[1][-1] == '}':
+            block.equ[operands[0]] = block.eval(operands[1][1:-1])
+        else:
+            block.equ[operands[0]] = operands[1]
         return
     
     try: