From c696d9610e2613b532bf18f013c1d724b8063ca6 Mon Sep 17 00:00:00 2001
From: jespergravgaard <jesper@balmangravgaard.dk>
Date: Wed, 27 Mar 2019 07:47:31 +0100
Subject: [PATCH] Added parenthesis to negative immediates to AXS.

---
 src/main/fragment/vbuxx=vbuaa_plus_vbuc1.asm  |  2 +-
 src/main/fragment/vbuxx=vbuxx_plus_vbuc1.asm  |  2 +-
 src/main/fragment/vbuxx=vbuz1_plus_vbuc1.asm  |  2 +-
 src/test/ref/bresenham.asm                    |  2 +-
 src/test/ref/bresenham.log                    |  6 +-
 src/test/ref/bresenhamarr.asm                 |  2 +-
 src/test/ref/bresenhamarr.log                 |  6 +-
 src/test/ref/c64dtv-gfxexplorer.asm           |  2 +-
 src/test/ref/c64dtv-gfxexplorer.log           |  6 +-
 src/test/ref/casting.asm                      |  2 +-
 src/test/ref/casting.log                      |  6 +-
 src/test/ref/clobber-a-problem.asm            |  2 +-
 src/test/ref/clobber-a-problem.log            |  6 +-
 src/test/ref/complex/tetris/test-sprites.asm  | 20 ++---
 src/test/ref/complex/tetris/test-sprites.log  | 60 ++++++-------
 src/test/ref/complex/tetris/tetris.asm        | 26 +++---
 src/test/ref/complex/tetris/tetris.log        | 84 +++++++++----------
 .../ref/consolidate-array-index-problem.asm   |  2 +-
 .../ref/consolidate-array-index-problem.log   |  6 +-
 src/test/ref/const-param.log                  |  2 +-
 src/test/ref/examples/3d/3d.asm               |  8 +-
 src/test/ref/examples/3d/3d.log               | 26 +++---
 .../multiplexer/simple-multiplexer.asm        |  2 +-
 .../multiplexer/simple-multiplexer.log        |  8 +-
 src/test/ref/examples/rotate/rotate.log       |  2 +-
 .../ref/examples/scrolllogo/scrolllogo.log    | 20 ++---
 .../ref/examples/sinsprites/sinus-sprites.asm |  6 +-
 .../ref/examples/sinsprites/sinus-sprites.log | 18 ++--
 src/test/ref/flipper-rex2.asm                 |  2 +-
 src/test/ref/flipper-rex2.log                 |  6 +-
 .../ref/fragments-assignment-binary-vbuxx.log | 34 ++++----
 .../ref/fragments-assignment-binary-vbuz1.log |  6 +-
 src/test/ref/iterarray.log                    |  2 +-
 src/test/ref/liverange.log                    |  4 +-
 src/test/ref/overlap-allocation-2.asm         |  2 +-
 src/test/ref/overlap-allocation-2.log         |  6 +-
 src/test/ref/sinusgenscale8.asm               |  2 +-
 src/test/ref/sinusgenscale8.log               |  6 +-
 src/test/ref/test-comments-block.log          |  2 +-
 src/test/ref/test-comments-single.log         |  2 +-
 src/test/ref/test-comparisons.asm             |  2 +-
 src/test/ref/test-comparisons.log             |  6 +-
 42 files changed, 209 insertions(+), 209 deletions(-)

diff --git a/src/main/fragment/vbuxx=vbuaa_plus_vbuc1.asm b/src/main/fragment/vbuxx=vbuaa_plus_vbuc1.asm
index c6062ed5b..929c21d2a 100644
--- a/src/main/fragment/vbuxx=vbuaa_plus_vbuc1.asm
+++ b/src/main/fragment/vbuxx=vbuaa_plus_vbuc1.asm
@@ -1,2 +1,2 @@
 tax
-axs #-{c1}
\ No newline at end of file
+axs #-[{c1}]
\ No newline at end of file
diff --git a/src/main/fragment/vbuxx=vbuxx_plus_vbuc1.asm b/src/main/fragment/vbuxx=vbuxx_plus_vbuc1.asm
index 28968ebf8..f997f2101 100644
--- a/src/main/fragment/vbuxx=vbuxx_plus_vbuc1.asm
+++ b/src/main/fragment/vbuxx=vbuxx_plus_vbuc1.asm
@@ -1,2 +1,2 @@
 txa
-axs #-{c1}
\ No newline at end of file
+axs #-[{c1}]
\ No newline at end of file
diff --git a/src/main/fragment/vbuxx=vbuz1_plus_vbuc1.asm b/src/main/fragment/vbuxx=vbuz1_plus_vbuc1.asm
index f43d0fc72..7bb35ab69 100644
--- a/src/main/fragment/vbuxx=vbuz1_plus_vbuc1.asm
+++ b/src/main/fragment/vbuxx=vbuz1_plus_vbuc1.asm
@@ -1,2 +1,2 @@
 lax {z1}
-axs #-{c1}
\ No newline at end of file
+axs #-[{c1}]
\ No newline at end of file
diff --git a/src/test/ref/bresenham.asm b/src/test/ref/bresenham.asm
index 903bc0915..c3b533e72 100644
--- a/src/test/ref/bresenham.asm
+++ b/src/test/ref/bresenham.asm
@@ -32,7 +32,7 @@ main: {
     inc cursor+1
   !:
     txa
-    axs #-yd
+    axs #-[yd]
     cpx #xd
     bcc b2
     inc y
diff --git a/src/test/ref/bresenham.log b/src/test/ref/bresenham.log
index 494448808..282e4a572 100644
--- a/src/test/ref/bresenham.log
+++ b/src/test/ref/bresenham.log
@@ -404,7 +404,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax e
-    axs #-yd
+    axs #-[yd]
     stx e
   //SEG26 [10] if((const byte) main::xd#0>(byte) main::e#1) goto main::@2 -- vbuc1_gt_vbuz1_then_la1 
     lda e
@@ -557,7 +557,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-yd
+    axs #-[yd]
   //SEG26 [10] if((const byte) main::xd#0>(byte) main::e#1) goto main::@2 -- vbuc1_gt_vbuxx_then_la1 
     cpx #xd
     bcc b2_from_b1
@@ -740,7 +740,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-yd
+    axs #-[yd]
   //SEG26 [10] if((const byte) main::xd#0>(byte) main::e#1) goto main::@2 -- vbuc1_gt_vbuxx_then_la1 
     cpx #xd
     bcc b2
diff --git a/src/test/ref/bresenhamarr.asm b/src/test/ref/bresenhamarr.asm
index 8e1fd7525..91047f4bf 100644
--- a/src/test/ref/bresenhamarr.asm
+++ b/src/test/ref/bresenhamarr.asm
@@ -37,7 +37,7 @@ main: {
     inc idx+1
   !:
     txa
-    axs #-yd
+    axs #-[yd]
     cpx #xd
     bcc b2
     beq b2
diff --git a/src/test/ref/bresenhamarr.log b/src/test/ref/bresenhamarr.log
index 7cb0c23bc..fad481081 100644
--- a/src/test/ref/bresenhamarr.log
+++ b/src/test/ref/bresenhamarr.log
@@ -406,7 +406,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax e
-    axs #-yd
+    axs #-[yd]
     stx e
   //SEG26 [10] if((const byte) main::xd#0>=(byte) main::e#1) goto main::@2 -- vbuc1_ge_vbuz1_then_la1 
     lda #xd
@@ -555,7 +555,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-yd
+    axs #-[yd]
   //SEG26 [10] if((const byte) main::xd#0>=(byte) main::e#1) goto main::@2 -- vbuc1_ge_vbuxx_then_la1 
     cpx #xd
     bcc b2_from_b1
@@ -744,7 +744,7 @@ main: {
   !:
   //SEG25 [9] (byte) main::e#1 ← (byte) main::e#3 + (const byte) main::yd#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-yd
+    axs #-[yd]
   //SEG26 [10] if((const byte) main::xd#0>=(byte) main::e#1) goto main::@2 -- vbuc1_ge_vbuxx_then_la1 
     cpx #xd
     bcc b2
diff --git a/src/test/ref/c64dtv-gfxexplorer.asm b/src/test/ref/c64dtv-gfxexplorer.asm
index ef1f896f4..d917a24d4 100644
--- a/src/test/ref/c64dtv-gfxexplorer.asm
+++ b/src/test/ref/c64dtv-gfxexplorer.asm
@@ -556,7 +556,7 @@ keyboard_event_scan: {
     cmp keyboard_scan_values,y
     bne b6
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   b3:
     inc row
diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index 49f46870b..350f494e0 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -14731,7 +14731,7 @@ keyboard_event_scan: {
   b13:
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG284 [167] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   b3_from_b13:
@@ -21806,7 +21806,7 @@ keyboard_event_scan: {
   b13:
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG284 [167] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   b3_from_b13:
@@ -29709,7 +29709,7 @@ keyboard_event_scan: {
   //SEG282 keyboard_event_scan::@13
   //SEG283 [166] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG284 [167] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   //SEG285 [167] phi (byte) keyboard_events_size#100 = (byte) keyboard_events_size#118 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3#0] -- register_copy 
diff --git a/src/test/ref/casting.asm b/src/test/ref/casting.asm
index ddb937ccb..6306b5952 100644
--- a/src/test/ref/casting.asm
+++ b/src/test/ref/casting.asm
@@ -32,7 +32,7 @@ w: {
   b1:
     tya
     tax
-    axs #-$578-$546
+    axs #-[$578-$546]
     lda #b
     sta SCREEN3,y
     txa
diff --git a/src/test/ref/casting.log b/src/test/ref/casting.log
index 636986a99..458e63ff0 100644
--- a/src/test/ref/casting.log
+++ b/src/test/ref/casting.log
@@ -440,7 +440,7 @@ w: {
   b1:
   //SEG34 [17] (byte) w::b2#0 ← (word/signed word/dword/signed dword) $578-(word/signed word/dword/signed dword) $546 + (byte) w::i#2 -- vbuz1=vbuc1_plus_vbuz2 
     lax i
-    axs #-$578-$546
+    axs #-[$578-$546]
     stx b2
   //SEG35 [18] *((const byte*) SCREEN3#0 + (byte) w::i#2) ← (const byte) w::b#0 -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #b
@@ -584,7 +584,7 @@ w: {
   //SEG34 [17] (byte) w::b2#0 ← (word/signed word/dword/signed dword) $578-(word/signed word/dword/signed dword) $546 + (byte) w::i#2 -- vbuxx=vbuc1_plus_vbuyy 
     tya
     tax
-    axs #-$578-$546
+    axs #-[$578-$546]
   //SEG35 [18] *((const byte*) SCREEN3#0 + (byte) w::i#2) ← (const byte) w::b#0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #b
     sta SCREEN3,y
@@ -756,7 +756,7 @@ w: {
   //SEG34 [17] (byte) w::b2#0 ← (word/signed word/dword/signed dword) $578-(word/signed word/dword/signed dword) $546 + (byte) w::i#2 -- vbuxx=vbuc1_plus_vbuyy 
     tya
     tax
-    axs #-$578-$546
+    axs #-[$578-$546]
   //SEG35 [18] *((const byte*) SCREEN3#0 + (byte) w::i#2) ← (const byte) w::b#0 -- pbuc1_derefidx_vbuyy=vbuc2 
     lda #b
     sta SCREEN3,y
diff --git a/src/test/ref/clobber-a-problem.asm b/src/test/ref/clobber-a-problem.asm
index 174bb4a3b..27614b4c8 100644
--- a/src/test/ref/clobber-a-problem.asm
+++ b/src/test/ref/clobber-a-problem.asm
@@ -24,7 +24,7 @@ irq: {
     lda #DARK_GREY
     sta BORDERCOL
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   // Setup next interrupt
     txa
diff --git a/src/test/ref/clobber-a-problem.log b/src/test/ref/clobber-a-problem.log
index c3c75bba1..85a705131 100644
--- a/src/test/ref/clobber-a-problem.log
+++ b/src/test/ref/clobber-a-problem.log
@@ -268,7 +268,7 @@ irq: {
     sta BORDERCOL
   //SEG18 [8] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next_1
   //SEG19 [9] (byte) irq::raster_next#0 ← (byte) irq_raster_next#1 -- vbuz1=vbuz2 
     // Setup next interrupt
@@ -400,7 +400,7 @@ irq: {
     sta BORDERCOL
   //SEG18 [8] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG19 [9] (byte) irq::raster_next#0 ← (byte) irq_raster_next#1 -- vbuxx=vbuz1 
     // Setup next interrupt
@@ -547,7 +547,7 @@ irq: {
     sta BORDERCOL
   //SEG18 [8] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG19 [9] (byte) irq::raster_next#0 ← (byte) irq_raster_next#1 -- vbuxx=vbuz1 
   // Setup next interrupt
diff --git a/src/test/ref/complex/tetris/test-sprites.asm b/src/test/ref/complex/tetris/test-sprites.asm
index ff783114b..ded391e52 100644
--- a/src/test/ref/complex/tetris/test-sprites.asm
+++ b/src/test/ref/complex/tetris/test-sprites.asm
@@ -119,10 +119,10 @@ main: {
     lda #toSpritePtr2_return
     sta PLAYFIELD_SPRITE_PTRS_1,y
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
     lax ypos
-    axs #-$18
+    axs #-[$18]
     stx ypos
     iny
     cpy #8
@@ -149,7 +149,7 @@ loop: {
     lda SIN,x
     sta SPRITES_YPOS,y
     txa
-    axs #-$a
+    axs #-[$a]
     inc s
     lda #8
     cmp s
@@ -210,7 +210,7 @@ sprites_init: {
     lda #BLACK
     sta SPRITES_COLS,y
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
     iny
     cpy #4
@@ -263,13 +263,13 @@ sprites_irq: {
     cmp irq_cnt
     beq b5
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   b7:
     // Setup next interrupt
@@ -289,15 +289,15 @@ sprites_irq: {
     lda #IRQ_RASTER_FIRST
     sta irq_raster_next
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7
   b4:
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
     lda #SPRITES_FIRST_YPOS
     sta irq_sprite_ypos
diff --git a/src/test/ref/complex/tetris/test-sprites.log b/src/test/ref/complex/tetris/test-sprites.log
index 6bcdc102e..20a66ef51 100644
--- a/src/test/ref/complex/tetris/test-sprites.log
+++ b/src/test/ref/complex/tetris/test-sprites.log
@@ -2348,11 +2348,11 @@ main: {
     sta PLAYFIELD_SPRITE_PTRS_1,y
   //SEG56 [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG57 [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax ypos
-    axs #-$18
+    axs #-[$18]
     stx ypos
   //SEG58 [31] (byte) main::s#1 ← ++ (byte) main::s#2 -- vbuz1=_inc_vbuz1 
     inc s
@@ -2433,7 +2433,7 @@ loop: {
     sta SPRITES_YPOS,y
   //SEG86 [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuz1=vbuz1_plus_vbuc1 
     lax idx
-    axs #-$a
+    axs #-[$a]
     stx idx
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
@@ -2547,7 +2547,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG122 [69] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG123 [70] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuz1=_inc_vbuz1 
     inc s
@@ -2670,15 +2670,15 @@ sprites_irq: {
   b12:
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next_3
   //SEG156 [94] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos_3
   //SEG157 [95] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr_3
   //SEG158 [96] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   b7_from_b12:
@@ -2717,18 +2717,18 @@ sprites_irq: {
     sta irq_raster_next_2
   //SEG168 [102] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos_2
   //SEG169 [103] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr_2
     jmp b7_from_b5
   //SEG170 sprites_irq::@4
   b4:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next_1
   //SEG172 [105] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
@@ -3258,11 +3258,11 @@ main: {
     sta PLAYFIELD_SPRITE_PTRS_1,y
   //SEG56 [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG57 [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax ypos
-    axs #-$18
+    axs #-[$18]
     stx ypos
   //SEG58 [31] (byte) main::s#1 ← ++ (byte) main::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -3337,7 +3337,7 @@ loop: {
     sta SPRITES_YPOS,y
   //SEG86 [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$a
+    axs #-[$a]
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
   //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@5 -- vbuz1_neq_vbuc1_then_la1 
@@ -3445,7 +3445,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG122 [69] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG123 [70] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -3543,15 +3543,15 @@ sprites_irq: {
   b12:
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
   //SEG156 [94] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG157 [95] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   //SEG158 [96] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   b7_from_b12:
@@ -3588,18 +3588,18 @@ sprites_irq: {
     sta irq_raster_next
   //SEG168 [102] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG169 [103] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7_from_b5
   //SEG170 sprites_irq::@4
   b4:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG172 [105] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
@@ -4264,11 +4264,11 @@ main: {
     sta PLAYFIELD_SPRITE_PTRS_1,y
   //SEG56 [29] (byte) main::xpos#1 ← (byte) main::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG57 [30] (byte) main::ypos#1 ← (byte) main::ypos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax ypos
-    axs #-$18
+    axs #-[$18]
     stx ypos
   //SEG58 [31] (byte) main::s#1 ← ++ (byte) main::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -4324,7 +4324,7 @@ loop: {
     sta SPRITES_YPOS,y
   //SEG86 [45] (byte) loop::idx#1 ← (byte) loop::idx#2 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$a
+    axs #-[$a]
   //SEG87 [46] (byte) loop::s#1 ← ++ (byte) loop::s#2 -- vbuz1=_inc_vbuz1 
     inc s
   //SEG88 [47] if((byte) loop::s#1!=(byte/signed byte/word/signed word/dword/signed dword) 8) goto loop::@5 -- vbuz1_neq_vbuc1_then_la1 
@@ -4421,7 +4421,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG122 [69] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG123 [70] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -4507,15 +4507,15 @@ sprites_irq: {
   //SEG154 sprites_irq::@12
   //SEG155 [93] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
   //SEG156 [94] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG157 [95] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   //SEG158 [96] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   //SEG159 [96] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#3 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7#0] -- register_copy 
@@ -4546,18 +4546,18 @@ sprites_irq: {
     sta irq_raster_next
   //SEG168 [102] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG169 [103] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7
   //SEG170 sprites_irq::@4
   b4:
   //SEG171 [104] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG172 [105] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
diff --git a/src/test/ref/complex/tetris/tetris.asm b/src/test/ref/complex/tetris/tetris.asm
index 37f1c5c9b..7fcda77fe 100644
--- a/src/test/ref/complex/tetris/tetris.asm
+++ b/src/test/ref/complex/tetris/tetris.asm
@@ -488,7 +488,7 @@ render_moving: {
     cmp ypos2
     bcc b2
     lax i
-    axs #-4
+    axs #-[4]
     stx i
   b3:
     lda ypos2
@@ -618,7 +618,7 @@ play_move_rotate: {
     rts
   b2:
     lax current_orientation
-    axs #-$10
+    axs #-[$10]
     lda #$3f
     sax orientation
   b4:
@@ -989,7 +989,7 @@ play_increase_level: {
     bne b3
     // If level low nybble hits $a change to $10
     lax level_bcd
-    axs #-6
+    axs #-[6]
     stx level_bcd
   b3:
     // Increase the score values gained
@@ -1060,7 +1060,7 @@ play_remove_lines: {
     cmp full
     bne b4
     txa
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     inc removed
   b4:
     inc y
@@ -1191,7 +1191,7 @@ keyboard_event_scan: {
     cmp keyboard_scan_values,y
     bne b6
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   b3:
     inc row
@@ -1340,7 +1340,7 @@ play_init: {
     inc pli+1
   !:
     lax idx
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     stx idx
     iny
     cpy #PLAYFIELD_LINES-1+1
@@ -1423,7 +1423,7 @@ sprites_init: {
     lda #BLACK
     sta SPRITES_COLS,y
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
     iny
     cpy #4
@@ -1654,13 +1654,13 @@ sprites_irq: {
     cmp irq_cnt
     beq b5
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   b7:
     // Setup next interrupt
@@ -1680,15 +1680,15 @@ sprites_irq: {
     lda #IRQ_RASTER_FIRST
     sta irq_raster_next
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7
   b4:
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
     lda #SPRITES_FIRST_YPOS
     sta irq_sprite_ypos
diff --git a/src/test/ref/complex/tetris/tetris.log b/src/test/ref/complex/tetris/tetris.log
index 1b94a04bb..7711c7501 100644
--- a/src/test/ref/complex/tetris/tetris.log
+++ b/src/test/ref/complex/tetris/tetris.log
@@ -13613,7 +13613,7 @@ render_bcd: {
     sta _3
   //SEG261 [99] (byte~) render_bcd::$4 ← (const byte) render_bcd::ZERO_CHAR#0 + (byte~) render_bcd::$3 -- vbuz1=vbuc1_plus_vbuz2 
     lax _3
-    axs #-ZERO_CHAR
+    axs #-[ZERO_CHAR]
     stx _4
   //SEG262 [100] *((byte*) render_bcd::screen_pos#0) ← (byte~) render_bcd::$4 -- _deref_pbuz1=vbuz2 
     lda _4
@@ -13637,7 +13637,7 @@ render_bcd: {
     sta _5
   //SEG268 [104] (byte~) render_bcd::$6 ← (const byte) render_bcd::ZERO_CHAR#0 + (byte~) render_bcd::$5 -- vbuz1=vbuc1_plus_vbuz2 
     lax _5
-    axs #-ZERO_CHAR
+    axs #-[ZERO_CHAR]
     stx _6
   //SEG269 [105] *((byte*) render_bcd::screen_pos#3) ← (byte~) render_bcd::$6 -- _deref_pbuz1=vbuz2 
     lda _6
@@ -13848,7 +13848,7 @@ render_moving: {
   b6:
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
-    axs #-4
+    axs #-[4]
     stx i
   //SEG334 [134] phi from render_moving::@5 render_moving::@6 to render_moving::@3 [phi:render_moving::@5/render_moving::@6->render_moving::@3]
   b3_from_b5:
@@ -14054,7 +14054,7 @@ play_movement: {
     sta _0
   //SEG400 [168] (byte) play_movement::render#1 ← (byte/signed byte/word/signed word/dword/signed dword) 0 + (byte~) play_movement::$0 -- vbuz1=vbuc1_plus_vbuz2 
     lax _0
-    axs #-0
+    axs #-[0]
     stx render
   //SEG401 [169] if((byte) game_over#15==(byte/signed byte/word/signed word/dword/signed dword) 0) goto play_movement::@1 -- vbuz1_eq_0_then_la1 
     lda game_over
@@ -14154,7 +14154,7 @@ play_move_rotate: {
   b2:
   //SEG433 [186] (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 ← (byte) current_orientation#20 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuz1=vbuz2_plus_vbuc1 
     lax current_orientation
-    axs #-$10
+    axs #-[$10]
     stx _2
   //SEG434 [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuz2_band_vbuc1 
     lda #$3f
@@ -15118,7 +15118,7 @@ play_increase_level: {
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
-    axs #-6
+    axs #-[6]
     stx level_bcd
   //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@7 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@7->play_increase_level::@3]
   b3_from_b2:
@@ -15280,7 +15280,7 @@ play_remove_lines: {
   b10:
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax w
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     stx w
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
@@ -15588,7 +15588,7 @@ keyboard_event_scan: {
   b13:
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG934 [403] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   b3_from_b13:
@@ -15983,7 +15983,7 @@ play_init: {
   !:
   //SEG1059 [466] (byte) play_init::idx#1 ← (byte) play_init::idx#2 + (const byte) PLAYFIELD_COLS#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax idx
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     stx idx
   //SEG1060 [467] (byte) play_init::j#1 ← ++ (byte) play_init::j#2 -- vbuz1=_inc_vbuz1 
     inc j
@@ -16137,7 +16137,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG1105 [497] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG1106 [498] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuz1=_inc_vbuz1 
     inc s
@@ -16599,15 +16599,15 @@ sprites_irq: {
   b12:
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next_3
   //SEG1245 [576] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos_3
   //SEG1246 [577] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr_3
   //SEG1247 [578] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   b7_from_b12:
@@ -16646,18 +16646,18 @@ sprites_irq: {
     sta irq_raster_next_2
   //SEG1257 [584] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos_2
   //SEG1258 [585] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr_2
     jmp b7_from_b5
   //SEG1259 sprites_irq::@4
   b4:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next_1
   //SEG1261 [587] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
@@ -19022,7 +19022,7 @@ render_moving: {
   b6:
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
-    axs #-4
+    axs #-[4]
     stx i
   //SEG334 [134] phi from render_moving::@5 render_moving::@6 to render_moving::@3 [phi:render_moving::@5/render_moving::@6->render_moving::@3]
   b3_from_b5:
@@ -19289,7 +19289,7 @@ play_move_rotate: {
   b2:
   //SEG433 [186] (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 ← (byte) current_orientation#20 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuxx=vbuz1_plus_vbuc1 
     lax current_orientation
-    axs #-$10
+    axs #-[$10]
   //SEG434 [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
@@ -20134,7 +20134,7 @@ play_increase_level: {
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
-    axs #-6
+    axs #-[6]
     stx level_bcd
   //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@7 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@7->play_increase_level::@3]
   b3_from_b2:
@@ -20286,7 +20286,7 @@ play_remove_lines: {
   b10:
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
   //SEG837 [358] phi from play_remove_lines::@10 play_remove_lines::@9 to play_remove_lines::@4 [phi:play_remove_lines::@10/play_remove_lines::@9->play_remove_lines::@4]
@@ -20558,7 +20558,7 @@ keyboard_event_scan: {
   b13:
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG934 [403] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   b3_from_b13:
@@ -20902,7 +20902,7 @@ play_init: {
   !:
   //SEG1059 [466] (byte) play_init::idx#1 ← (byte) play_init::idx#2 + (const byte) PLAYFIELD_COLS#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax idx
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     stx idx
   //SEG1060 [467] (byte) play_init::j#1 ← ++ (byte) play_init::j#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -21047,7 +21047,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG1105 [497] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG1106 [498] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -21472,15 +21472,15 @@ sprites_irq: {
   b12:
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
   //SEG1245 [576] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG1246 [577] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   //SEG1247 [578] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   b7_from_b12:
@@ -21517,18 +21517,18 @@ sprites_irq: {
     sta irq_raster_next
   //SEG1257 [584] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG1258 [585] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7_from_b5
   //SEG1259 sprites_irq::@4
   b4:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG1261 [587] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
@@ -24438,7 +24438,7 @@ render_moving: {
   //SEG332 render_moving::@6
   //SEG333 [133] (byte) render_moving::i#1 ← (byte) render_moving::i#3 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
-    axs #-4
+    axs #-[4]
     stx i
   //SEG334 [134] phi from render_moving::@5 render_moving::@6 to render_moving::@3 [phi:render_moving::@5/render_moving::@6->render_moving::@3]
   //SEG335 [134] phi (byte) render_moving::i#8 = (byte) render_moving::i#2 [phi:render_moving::@5/render_moving::@6->render_moving::@3#0] -- register_copy 
@@ -24668,7 +24668,7 @@ play_move_rotate: {
   b2:
   //SEG433 [186] (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 ← (byte) current_orientation#20 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuxx=vbuz1_plus_vbuc1 
     lax current_orientation
-    axs #-$10
+    axs #-[$10]
   //SEG434 [187] (byte) play_move_rotate::orientation#2 ← (byte/signed word/word/dword/signed dword~) play_move_rotate::$2 & (byte/signed byte/word/signed word/dword/signed dword) $3f -- vbuz1=vbuxx_band_vbuc1 
     lda #$3f
     sax orientation
@@ -25387,7 +25387,7 @@ play_increase_level: {
   //SEG781 [334] (byte) level_bcd#8 ← (byte) level_bcd#21 + (byte/signed byte/word/signed word/dword/signed dword) 6 -- vbuz1=vbuz1_plus_vbuc1 
     // If level low nybble hits $a change to $10
     lax level_bcd
-    axs #-6
+    axs #-[6]
     stx level_bcd
   //SEG782 [335] phi from play_increase_level::@2 play_increase_level::@7 to play_increase_level::@3 [phi:play_increase_level::@2/play_increase_level::@7->play_increase_level::@3]
   //SEG783 [335] phi (byte) level_bcd#64 = (byte) level_bcd#21 [phi:play_increase_level::@2/play_increase_level::@7->play_increase_level::@3#0] -- register_copy 
@@ -25512,7 +25512,7 @@ play_remove_lines: {
   //SEG834 play_remove_lines::@10
   //SEG835 [356] (byte) play_remove_lines::w#2 ← (byte) play_remove_lines::w#1 + (const byte) PLAYFIELD_COLS#0 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
   //SEG836 [357] (byte) play_remove_lines::removed#1 ← ++ (byte) play_remove_lines::removed#11 -- vbuz1=_inc_vbuz1 
     inc removed
   //SEG837 [358] phi from play_remove_lines::@10 play_remove_lines::@9 to play_remove_lines::@4 [phi:play_remove_lines::@10/play_remove_lines::@9->play_remove_lines::@4]
@@ -25741,7 +25741,7 @@ keyboard_event_scan: {
   //SEG932 keyboard_event_scan::@13
   //SEG933 [402] (byte) keyboard_event_scan::keycode#1 ← (byte) keyboard_event_scan::keycode#11 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax keycode
-    axs #-8
+    axs #-[8]
     stx keycode
   //SEG934 [403] phi from keyboard_event_scan::@13 keyboard_event_scan::@19 to keyboard_event_scan::@3 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3]
   //SEG935 [403] phi (byte) keyboard_events_size#13 = (byte) keyboard_events_size#29 [phi:keyboard_event_scan::@13/keyboard_event_scan::@19->keyboard_event_scan::@3#0] -- register_copy 
@@ -26016,7 +26016,7 @@ play_init: {
   !:
   //SEG1059 [466] (byte) play_init::idx#1 ← (byte) play_init::idx#2 + (const byte) PLAYFIELD_COLS#0 -- vbuz1=vbuz1_plus_vbuc1 
     lax idx
-    axs #-PLAYFIELD_COLS
+    axs #-[PLAYFIELD_COLS]
     stx idx
   //SEG1060 [467] (byte) play_init::j#1 ← ++ (byte) play_init::j#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -26145,7 +26145,7 @@ sprites_init: {
     sta SPRITES_COLS,y
   //SEG1105 [497] (byte) sprites_init::xpos#1 ← (byte) sprites_init::xpos#2 + (byte/signed byte/word/signed word/dword/signed dword) $18 -- vbuz1=vbuz1_plus_vbuc1 
     lax xpos
-    axs #-$18
+    axs #-[$18]
     stx xpos
   //SEG1106 [498] (byte) sprites_init::s#1 ← ++ (byte) sprites_init::s#2 -- vbuyy=_inc_vbuyy 
     iny
@@ -26515,15 +26515,15 @@ sprites_irq: {
   //SEG1243 sprites_irq::@12
   //SEG1244 [575] (byte) irq_raster_next#3 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$14
+    axs #-[$14]
     stx irq_raster_next
   //SEG1245 [576] (byte) irq_sprite_ypos#3 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG1246 [577] (byte) irq_sprite_ptr#3 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
   //SEG1247 [578] phi from sprites_irq::@12 sprites_irq::@15 sprites_irq::@5 to sprites_irq::@7 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7]
   //SEG1248 [578] phi (byte) irq_raster_next#4 = (byte) irq_raster_next#3 [phi:sprites_irq::@12/sprites_irq::@15/sprites_irq::@5->sprites_irq::@7#0] -- register_copy 
@@ -26554,18 +26554,18 @@ sprites_irq: {
     sta irq_raster_next
   //SEG1257 [584] (byte) irq_sprite_ypos#2 ← (byte) irq_sprite_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ypos
-    axs #-$15
+    axs #-[$15]
     stx irq_sprite_ypos
   //SEG1258 [585] (byte) irq_sprite_ptr#2 ← (byte) irq_sprite_ptr#0 + (byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_sprite_ptr
-    axs #-3
+    axs #-[3]
     stx irq_sprite_ptr
     jmp b7
   //SEG1259 sprites_irq::@4
   b4:
   //SEG1260 [586] (byte) irq_raster_next#1 ← (byte) irq_raster_next#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz1_plus_vbuc1 
     lax irq_raster_next
-    axs #-$15
+    axs #-[$15]
     stx irq_raster_next
   //SEG1261 [587] (byte) irq_sprite_ypos#1 ← (const byte) SPRITES_FIRST_YPOS#0 -- vbuz1=vbuc1 
     lda #SPRITES_FIRST_YPOS
diff --git a/src/test/ref/consolidate-array-index-problem.asm b/src/test/ref/consolidate-array-index-problem.asm
index ea94dd246..16a07f6e9 100644
--- a/src/test/ref/consolidate-array-index-problem.asm
+++ b/src/test/ref/consolidate-array-index-problem.asm
@@ -9,7 +9,7 @@ main: {
   b1:
     tya
     tax
-    axs #-$c
+    axs #-[$c]
     lda #'a'
     sta screen,x
     lda #BLACK
diff --git a/src/test/ref/consolidate-array-index-problem.log b/src/test/ref/consolidate-array-index-problem.log
index 634118e73..2b1edade8 100644
--- a/src/test/ref/consolidate-array-index-problem.log
+++ b/src/test/ref/consolidate-array-index-problem.log
@@ -177,7 +177,7 @@ main: {
   b1:
   //SEG16 [6] (byte) main::y#0 ← (byte) main::x#2 + (byte/signed byte/word/signed word/dword/signed dword) $c -- vbuz1=vbuz2_plus_vbuc1 
     lax x
-    axs #-$c
+    axs #-[$c]
     stx y
   //SEG17 [7] *((const byte*) main::screen#0 + (byte) main::y#0) ← (byte) 'a' -- pbuc1_derefidx_vbuz1=vbuc2 
     lda #'a'
@@ -260,7 +260,7 @@ main: {
   //SEG16 [6] (byte) main::y#0 ← (byte) main::x#2 + (byte/signed byte/word/signed word/dword/signed dword) $c -- vbuxx=vbuyy_plus_vbuc1 
     tya
     tax
-    axs #-$c
+    axs #-[$c]
   //SEG17 [7] *((const byte*) main::screen#0 + (byte) main::y#0) ← (byte) 'a' -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #'a'
     sta screen,x
@@ -358,7 +358,7 @@ main: {
   //SEG16 [6] (byte) main::y#0 ← (byte) main::x#2 + (byte/signed byte/word/signed word/dword/signed dword) $c -- vbuxx=vbuyy_plus_vbuc1 
     tya
     tax
-    axs #-$c
+    axs #-[$c]
   //SEG17 [7] *((const byte*) main::screen#0 + (byte) main::y#0) ← (byte) 'a' -- pbuc1_derefidx_vbuxx=vbuc2 
     lda #'a'
     sta screen,x
diff --git a/src/test/ref/const-param.log b/src/test/ref/const-param.log
index 45c971efb..69c348bb7 100644
--- a/src/test/ref/const-param.log
+++ b/src/test/ref/const-param.log
@@ -339,7 +339,7 @@ sum: {
     .label b = 2
   //SEG35 [19] (byte) sum::return#3 ← (const byte) main::reverse#0 + (byte) sum::b#3 -- vbuz1=vbuc1_plus_vbuz2 
     lax b
-    axs #-main.reverse
+    axs #-[main.reverse]
     stx return_3
     jmp breturn
   //SEG36 sum::@return
diff --git a/src/test/ref/examples/3d/3d.asm b/src/test/ref/examples/3d/3d.asm
index 393897ad4..da3808e59 100644
--- a/src/test/ref/examples/3d/3d.asm
+++ b/src/test/ref/examples/3d/3d.asm
@@ -321,7 +321,7 @@ debug_print: {
     ldx yps,y
     jsr print_sbyte_at
     lax c
-    axs #-4
+    axs #-[4]
     stx c
     inc i
     lda #8
@@ -555,7 +555,7 @@ calculate_matrix: {
     axs #sz
     stx t1
     lax sy
-    axs #-sz
+    axs #-[sz]
     tya
     clc
     adc #sz
@@ -863,7 +863,7 @@ debug_print_init: {
     sta j
   b2:
     lax i
-    axs #-8
+    axs #-[8]
     lda c
     clc
     adc #<at_cols
@@ -1024,7 +1024,7 @@ debug_print_init: {
     jmp b2
   !b2:
     lax c
-    axs #-4
+    axs #-[4]
     stx c
     inc i
     lda #8
diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log
index 3a6116157..65716fca0 100644
--- a/src/test/ref/examples/3d/3d.log
+++ b/src/test/ref/examples/3d/3d.log
@@ -5622,7 +5622,7 @@ debug_print: {
   b32:
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG229 [111] (byte) debug_print::i#1 ← ++ (byte) debug_print::i#2 -- vbuz1=_inc_vbuz1 
     inc i
@@ -5994,11 +5994,11 @@ calculate_matrix: {
     stx t1
   //SEG291 [145] (signed byte) calculate_matrix::t2#0 ← (signed byte) calculate_matrix::sy#0 + (const signed byte) sz#0 -- vbsz1=vbsz2_plus_vbsc1 
     lax sy
-    axs #-sz
+    axs #-[sz]
     stx t2
   //SEG292 [146] (signed byte) calculate_matrix::t3#0 ← (signed byte) calculate_matrix::sx#0 + (const signed byte) sz#0 -- vbsz1=vbsz2_plus_vbsc1 
     lax sx
-    axs #-sz
+    axs #-[sz]
     stx t3
   //SEG293 [147] (signed byte) calculate_matrix::t4#0 ← (signed byte) calculate_matrix::sx#0 - (const signed byte) sz#0 -- vbsz1=vbsz2_minus_vbsc1 
     lax sx
@@ -6574,7 +6574,7 @@ debug_print_init: {
   b2:
   //SEG443 [226] (byte) debug_print_init::col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 + (byte) debug_print_init::i#2 -- vbuz1=vbuc1_plus_vbuz2 
     lax i
-    axs #-8
+    axs #-[8]
     stx col
   //SEG444 [227] (byte*~) debug_print_init::$59 ← (const byte*) debug_print_init::at_cols#0 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
@@ -6767,7 +6767,7 @@ debug_print_init: {
   b3:
   //SEG474 [256] (byte) debug_print_init::c#1 ← (byte) debug_print_init::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG475 [257] (byte) debug_print_init::i#1 ← ++ (byte) debug_print_init::i#2 -- vbuz1=_inc_vbuz1 
     inc i
@@ -8536,7 +8536,7 @@ debug_print: {
   b32:
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG229 [111] (byte) debug_print::i#1 ← ++ (byte) debug_print::i#2 -- vbuz1=_inc_vbuz1 
     inc i
@@ -8856,7 +8856,7 @@ calculate_matrix: {
     stx t1
   //SEG291 [145] (signed byte) calculate_matrix::t2#0 ← (signed byte) calculate_matrix::sy#0 + (const signed byte) sz#0 -- vbsxx=vbsz1_plus_vbsc1 
     lax sy
-    axs #-sz
+    axs #-[sz]
   //SEG292 [146] (signed byte) calculate_matrix::t3#0 ← (signed byte) calculate_matrix::sx#0 + (const signed byte) sz#0 -- vbsz1=vbsyy_plus_vbsc1 
     tya
     clc
@@ -9384,7 +9384,7 @@ debug_print_init: {
   b2:
   //SEG443 [226] (byte) debug_print_init::col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 + (byte) debug_print_init::i#2 -- vbuxx=vbuc1_plus_vbuz1 
     lax i
-    axs #-8
+    axs #-[8]
   //SEG444 [227] (byte*~) debug_print_init::$59 ← (const byte*) debug_print_init::at_cols#0 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -9576,7 +9576,7 @@ debug_print_init: {
   b3:
   //SEG474 [256] (byte) debug_print_init::c#1 ← (byte) debug_print_init::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG475 [257] (byte) debug_print_init::i#1 ← ++ (byte) debug_print_init::i#2 -- vbuz1=_inc_vbuz1 
     inc i
@@ -11278,7 +11278,7 @@ debug_print: {
   //SEG227 debug_print::@32
   //SEG228 [110] (byte) debug_print::c#1 ← (byte) debug_print::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG229 [111] (byte) debug_print::i#1 ← ++ (byte) debug_print::i#2 -- vbuz1=_inc_vbuz1 
     inc i
@@ -11575,7 +11575,7 @@ calculate_matrix: {
     stx t1
   //SEG291 [145] (signed byte) calculate_matrix::t2#0 ← (signed byte) calculate_matrix::sy#0 + (const signed byte) sz#0 -- vbsxx=vbsz1_plus_vbsc1 
     lax sy
-    axs #-sz
+    axs #-[sz]
   //SEG292 [146] (signed byte) calculate_matrix::t3#0 ← (signed byte) calculate_matrix::sx#0 + (const signed byte) sz#0 -- vbsz1=vbsyy_plus_vbsc1 
     tya
     clc
@@ -12035,7 +12035,7 @@ debug_print_init: {
   b2:
   //SEG443 [226] (byte) debug_print_init::col#0 ← (byte/signed byte/word/signed word/dword/signed dword) 8 + (byte) debug_print_init::i#2 -- vbuxx=vbuc1_plus_vbuz1 
     lax i
-    axs #-8
+    axs #-[8]
   //SEG444 [227] (byte*~) debug_print_init::$59 ← (const byte*) debug_print_init::at_cols#0 + (byte) debug_print_init::c#2 -- pbuz1=pbuc1_plus_vbuz2 
     lda c
     clc
@@ -12227,7 +12227,7 @@ debug_print_init: {
   //SEG473 debug_print_init::@3
   //SEG474 [256] (byte) debug_print_init::c#1 ← (byte) debug_print_init::c#2 + (byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz1_plus_vbuc1 
     lax c
-    axs #-4
+    axs #-[4]
     stx c
   //SEG475 [257] (byte) debug_print_init::i#1 ← ++ (byte) debug_print_init::i#2 -- vbuz1=_inc_vbuz1 
     inc i
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.asm b/src/test/ref/examples/multiplexer/simple-multiplexer.asm
index 5b8d28c4a..73a968a01 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.asm
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.asm
@@ -51,7 +51,7 @@ loop: {
     lda YSIN,x
     sta PLEX_YPOS,y
     txa
-    axs #-8
+    axs #-[8]
     iny
     cpy #PLEX_COUNT-1+1
     bne b7
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.log b/src/test/ref/examples/multiplexer/simple-multiplexer.log
index ca56b75cc..b8a5774f7 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.log
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.log
@@ -2485,7 +2485,7 @@ loop: {
     sta PLEX_YPOS,y
   //SEG38 [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax y_idx
-    axs #-8
+    axs #-[8]
     stx y_idx
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuz1=_inc_vbuz1 
     inc sy
@@ -2625,7 +2625,7 @@ plexShowSprite: {
   plexFreeAdd1:
   //SEG84 [39] (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0 ← (byte) plexShowSprite::plexFreeAdd1_ypos#0 + (byte/signed byte/word/signed word/dword/signed dword) $15 -- vbuz1=vbuz2_plus_vbuc1 
     lax plexFreeAdd1_ypos
-    axs #-$15
+    axs #-[$15]
     stx plexFreeAdd1__0
   //SEG85 [40] *((const byte[8]) PLEX_FREE_YPOS#0 + (byte) plex_free_next#17) ← (byte/signed word/word/dword/signed dword) plexShowSprite::plexFreeAdd1_$0#0 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda plexFreeAdd1__0
@@ -3306,7 +3306,7 @@ loop: {
     sta PLEX_YPOS,y
   //SEG38 [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-8
+    axs #-[8]
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7 -- vbuyy_neq_vbuc1_then_la1 
@@ -4271,7 +4271,7 @@ loop: {
     sta PLEX_YPOS,y
   //SEG38 [18] (byte) loop::y_idx#1 ← (byte) loop::y_idx#2 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-8
+    axs #-[8]
   //SEG39 [19] (byte) loop::sy#1 ← ++ (byte) loop::sy#2 -- vbuyy=_inc_vbuyy 
     iny
   //SEG40 [20] if((byte) loop::sy#1!=(const byte) PLEX_COUNT#0-(byte/signed byte/word/signed word/dword/signed dword) 1+(byte/signed byte/word/signed word/dword/signed dword) 1) goto loop::@7 -- vbuyy_neq_vbuc1_then_la1 
diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log
index d9f856e9e..adda60364 100644
--- a/src/test/ref/examples/rotate/rotate.log
+++ b/src/test/ref/examples/rotate/rotate.log
@@ -2514,7 +2514,7 @@ anim: {
     sta _22
   //SEG96 [52] (byte) anim::ypos#0 ← (byte~) anim::$22 + (byte/signed byte/word/signed word/dword/signed dword) $59+(byte/signed byte/word/signed word/dword/signed dword) $33 -- vbuz1=vbuz2_plus_vbuc1 
     lax _22
-    axs #-$59+$33
+    axs #-[$59+$33]
     stx ypos
   //SEG97 [53] (byte) anim::i2#0 ← (byte) anim::i#10 << (byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_rol_1 
     lda i
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.log b/src/test/ref/examples/scrolllogo/scrolllogo.log
index e35b288d8..d683eddea 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.log
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.log
@@ -4326,7 +4326,7 @@ render_logo: {
   b9_1:
   //SEG98 [52] (byte/signed word/word/dword/signed dword~) render_logo::$34 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx
-    axs #-$28*1
+    axs #-[$28*1]
     stx _34
   //SEG99 [53] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$34 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _34
@@ -4337,7 +4337,7 @@ render_logo: {
   b9_2:
   //SEG101 [54] (byte/signed word/word/dword/signed dword~) render_logo::$38 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx
-    axs #-$28*2
+    axs #-[$28*2]
     stx _38
   //SEG102 [55] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$38 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _38
@@ -4348,7 +4348,7 @@ render_logo: {
   b9_3:
   //SEG104 [56] (byte/signed word/word/dword/signed dword~) render_logo::$42 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx
-    axs #-$28*3
+    axs #-[$28*3]
     stx _42
   //SEG105 [57] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$42 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _42
@@ -4359,7 +4359,7 @@ render_logo: {
   b9_4:
   //SEG107 [58] (byte/signed word/word/dword/signed dword~) render_logo::$46 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx
-    axs #-$28*4
+    axs #-[$28*4]
     stx _46
   //SEG108 [59] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$46 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _46
@@ -4370,7 +4370,7 @@ render_logo: {
   b9_5:
   //SEG110 [60] (byte/signed word/word/dword/signed dword~) render_logo::$50 ← (byte) render_logo::logo_idx#10 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx
-    axs #-$28*5
+    axs #-[$28*5]
     stx _50
   //SEG111 [61] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#10) ← (byte/signed word/word/dword/signed dword~) render_logo::$50 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _50
@@ -4535,7 +4535,7 @@ render_logo: {
   b14_1:
   //SEG164 [86] (byte/signed word/word/dword/signed dword~) render_logo::$80 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx_11
-    axs #-$28*1
+    axs #-[$28*1]
     stx _80
   //SEG165 [87] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 1 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$80 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _80
@@ -4546,7 +4546,7 @@ render_logo: {
   b14_2:
   //SEG167 [88] (byte/signed word/word/dword/signed dword~) render_logo::$84 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx_11
-    axs #-$28*2
+    axs #-[$28*2]
     stx _84
   //SEG168 [89] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 2 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$84 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _84
@@ -4557,7 +4557,7 @@ render_logo: {
   b14_3:
   //SEG170 [90] (byte/signed word/word/dword/signed dword~) render_logo::$88 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx_11
-    axs #-$28*3
+    axs #-[$28*3]
     stx _88
   //SEG171 [91] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 3 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$88 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _88
@@ -4568,7 +4568,7 @@ render_logo: {
   b14_4:
   //SEG173 [92] (byte/signed word/word/dword/signed dword~) render_logo::$92 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx_11
-    axs #-$28*4
+    axs #-[$28*4]
     stx _92
   //SEG174 [93] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 4 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$92 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _92
@@ -4579,7 +4579,7 @@ render_logo: {
   b14_5:
   //SEG176 [94] (byte/signed word/word/dword/signed dword~) render_logo::$96 ← (byte) render_logo::logo_idx#11 + (byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 -- vbuz1=vbuz2_plus_vbuc1 
     lax logo_idx_11
-    axs #-$28*5
+    axs #-[$28*5]
     stx _96
   //SEG177 [95] *((const byte*) SCREEN#0+(byte/signed byte/word/signed word/dword/signed dword) $28*(byte/signed byte/word/signed word/dword/signed dword) 5 + (byte) render_logo::screen_idx#21) ← (byte/signed word/word/dword/signed dword~) render_logo::$96 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _96
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.asm b/src/test/ref/examples/sinsprites/sinus-sprites.asm
index 4a74cc664..f3b700b77 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.asm
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.asm
@@ -78,7 +78,7 @@ anim: {
     ldy j2
     sta SPRITES_YPOS,y
     lax xidx
-    axs #-$a
+    axs #-[$a]
     stx xidx
     txa
     cmp #sinlen_x
@@ -88,7 +88,7 @@ anim: {
     stx xidx
   b2:
     lax yidx
-    axs #-8
+    axs #-[8]
     stx yidx
     txa
     cmp #sinlen_y
@@ -612,7 +612,7 @@ place_sprites: {
     ldy j
     sta SPRITES_COLS,y
     lax spr_x
-    axs #-$20
+    axs #-[$20]
     stx spr_x
     lda col
     eor #7^5
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log
index fae045794..36f65701e 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.log
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.log
@@ -3611,7 +3611,7 @@ anim: {
     sta SPRITES_YPOS,y
   //SEG49 [21] (byte) anim::xidx#1 ← (byte) anim::xidx#3 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuz1=vbuz1_plus_vbuc1 
     lax xidx
-    axs #-$a
+    axs #-[$a]
     stx xidx
   //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda xidx
@@ -3633,7 +3633,7 @@ anim: {
   b2:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
-    axs #-8
+    axs #-[8]
     stx yidx
   //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda yidx
@@ -4867,7 +4867,7 @@ place_sprites: {
     sta SPRITES_COLS,y
   //SEG466 [220] (byte) place_sprites::spr_x#1 ← (byte) place_sprites::spr_x#2 + (byte/signed byte/word/signed word/dword/signed dword) $20 -- vbuz1=vbuz1_plus_vbuc1 
     lax spr_x
-    axs #-$20
+    axs #-[$20]
     stx spr_x
   //SEG467 [221] (byte) place_sprites::col#1 ← (byte) place_sprites::col#2 ^ (byte/signed byte/word/signed word/dword/signed dword) 7^(byte/signed byte/word/signed word/dword/signed dword) 5 -- vbuz1=vbuz1_bxor_vbuc1 
     lda col
@@ -5457,7 +5457,7 @@ anim: {
     sta SPRITES_YPOS,y
   //SEG49 [21] (byte) anim::xidx#1 ← (byte) anim::xidx#3 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuz1=vbuz1_plus_vbuc1 
     lax xidx
-    axs #-$a
+    axs #-[$a]
     stx xidx
   //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@2 -- vbuz1_lt_vbuc1_then_la1 
     lda xidx
@@ -5479,7 +5479,7 @@ anim: {
   b2:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
-    axs #-8
+    axs #-[8]
     stx yidx
   //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@3 -- vbuz1_lt_vbuc1_then_la1 
     lda yidx
@@ -6650,7 +6650,7 @@ place_sprites: {
     sta SPRITES_COLS,y
   //SEG466 [220] (byte) place_sprites::spr_x#1 ← (byte) place_sprites::spr_x#2 + (byte/signed byte/word/signed word/dword/signed dword) $20 -- vbuz1=vbuz1_plus_vbuc1 
     lax spr_x
-    axs #-$20
+    axs #-[$20]
     stx spr_x
   //SEG467 [221] (byte) place_sprites::col#1 ← (byte) place_sprites::col#2 ^ (byte/signed byte/word/signed word/dword/signed dword) 7^(byte/signed byte/word/signed word/dword/signed dword) 5 -- vbuz1=vbuz1_bxor_vbuc1 
     lda col
@@ -7523,7 +7523,7 @@ anim: {
     sta SPRITES_YPOS,y
   //SEG49 [21] (byte) anim::xidx#1 ← (byte) anim::xidx#3 + (byte/signed byte/word/signed word/dword/signed dword) $a -- vbuz1=vbuz1_plus_vbuc1 
     lax xidx
-    axs #-$a
+    axs #-[$a]
     stx xidx
   //SEG50 [22] if((byte) anim::xidx#1<(const byte) sinlen_x#0) goto anim::@2 -- vbuz1_lt_vbuc1_then_la1 
     txa
@@ -7540,7 +7540,7 @@ anim: {
   b2:
   //SEG56 [25] (byte) anim::yidx#1 ← (byte) anim::yidx#3 + (byte/signed byte/word/signed word/dword/signed dword) 8 -- vbuz1=vbuz1_plus_vbuc1 
     lax yidx
-    axs #-8
+    axs #-[8]
     stx yidx
   //SEG57 [26] if((byte) anim::yidx#1<(const byte) sinlen_y#0) goto anim::@3 -- vbuz1_lt_vbuc1_then_la1 
     txa
@@ -8474,7 +8474,7 @@ place_sprites: {
     sta SPRITES_COLS,y
   //SEG466 [220] (byte) place_sprites::spr_x#1 ← (byte) place_sprites::spr_x#2 + (byte/signed byte/word/signed word/dword/signed dword) $20 -- vbuz1=vbuz1_plus_vbuc1 
     lax spr_x
-    axs #-$20
+    axs #-[$20]
     stx spr_x
   //SEG467 [221] (byte) place_sprites::col#1 ← (byte) place_sprites::col#2 ^ (byte/signed byte/word/signed word/dword/signed dword) 7^(byte/signed byte/word/signed word/dword/signed dword) 5 -- vbuz1=vbuz1_bxor_vbuc1 
     lda col
diff --git a/src/test/ref/flipper-rex2.asm b/src/test/ref/flipper-rex2.asm
index 7e7bb60b6..755c29b5a 100644
--- a/src/test/ref/flipper-rex2.asm
+++ b/src/test/ref/flipper-rex2.asm
@@ -71,7 +71,7 @@ flip: {
     sta buffer2,x
     iny
     txa
-    axs #-$10
+    axs #-[$10]
     dec c
     lda c
     cmp #0
diff --git a/src/test/ref/flipper-rex2.log b/src/test/ref/flipper-rex2.log
index f0e9ace50..ed6af953e 100644
--- a/src/test/ref/flipper-rex2.log
+++ b/src/test/ref/flipper-rex2.log
@@ -836,7 +836,7 @@ flip: {
     inc srcIdx
   //SEG81 [31] (byte) flip::dstIdx#1 ← (byte) flip::dstIdx#3 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuz1=vbuz1_plus_vbuc1 
     lax dstIdx
-    axs #-$10
+    axs #-[$10]
     stx dstIdx
   //SEG82 [32] (byte) flip::c#1 ← -- (byte) flip::c#2 -- vbuz1=_dec_vbuz1 
     dec c
@@ -1181,7 +1181,7 @@ flip: {
     iny
   //SEG81 [31] (byte) flip::dstIdx#1 ← (byte) flip::dstIdx#3 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$10
+    axs #-[$10]
   //SEG82 [32] (byte) flip::c#1 ← -- (byte) flip::c#2 -- vbuz1=_dec_vbuz1 
     dec c
   //SEG83 [33] if((byte) flip::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@2 -- vbuz1_neq_0_then_la1 
@@ -1579,7 +1579,7 @@ flip: {
     iny
   //SEG81 [31] (byte) flip::dstIdx#1 ← (byte) flip::dstIdx#3 + (byte/signed byte/word/signed word/dword/signed dword) $10 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$10
+    axs #-[$10]
   //SEG82 [32] (byte) flip::c#1 ← -- (byte) flip::c#2 -- vbuz1=_dec_vbuz1 
     dec c
   //SEG83 [33] if((byte) flip::c#1!=(byte/signed byte/word/signed word/dword/signed dword) 0) goto flip::@2 -- vbuz1_neq_0_then_la1 
diff --git a/src/test/ref/fragments-assignment-binary-vbuxx.log b/src/test/ref/fragments-assignment-binary-vbuxx.log
index 706d3f19b..1252ca993 100644
--- a/src/test/ref/fragments-assignment-binary-vbuxx.log
+++ b/src/test/ref/fragments-assignment-binary-vbuxx.log
@@ -354,7 +354,7 @@ vbuxx=vbuyy_bor_vbuc1 < vbuaa=vbuyy_bor_vbuc1 < vbuaa=vbuaa_bor_vbuc1 - clobber:
 vbuxx=vbuyy_plus_vbuc1 < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:6.0
   tya
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 CANNOT SYNTHESIZE vbuxx=vbuz1_bxor_vbuaa
 vbuxx=vbuz1_band_vbuxx < vbuxx=vbuaa_band_vbuxx < vbuxx=vbuxx_band_vbuaa - clobber:A X   cycles:5.0
   lda {z1}
@@ -526,7 +526,7 @@ vbuxx=vbuz1_bor_vbuc1 < vbuxx=vbuc1_bor_vbuz1 < vbuaa=vbuc1_bor_vbuz1 < vbuaa=vb
   tax
 *vbuxx=vbuz1_plus_vbuc1 - clobber:A X   cycles:5.0
   lax {z1}
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=_deref_pbuz1_bxor_vbuaa < vbuaa=_deref_pbuz1_bxor_vbuaa < vbuaa=vbuaa_bxor__deref_pbuz1 - clobber:A X Y  cycles:9.5
   ldy #0
   eor ({z1}),y
@@ -723,7 +723,7 @@ vbuxx=_deref_pbuz1_plus_vbuc1 < vbuxx=vbuc1_plus__deref_pbuz1 < vbuxx=vbuc1_plus
   ldy #0
   lda ({z1}),y
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=_deref_pbuc1_bxor_vbuaa < vbuxx=vbuaa_bxor__deref_pbuc1 < vbuaa=vbuaa_bxor__deref_pbuc1 - clobber:A X   cycles:6.0
   eor {c1}
   tax
@@ -921,7 +921,7 @@ vbuxx=_deref_pbuc1_bor_vbuc1 < vbuxx=vbuc1_bor__deref_pbuc1 < vbuaa=vbuc1_bor__d
 vbuxx=_deref_pbuc1_plus_vbuc1 < vbuxx=vbuc1_plus__deref_pbuc1 < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:8.0
   lda {c1}
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=_deref_pbuc1_bor_vbuc2 < vbuxx=vbuc2_bor__deref_pbuc1 < vbuaa=vbuc2_bor__deref_pbuc1 < vbuaa=_deref_pbuc1_bor_vbuc2 < vbuaa=_deref_pbuc1_bor_vbuaa < vbuaa=vbuaa_bor__deref_pbuc1 - clobber:A X   cycles:8.0
   lda #{c2}
   ora {c1}
@@ -929,7 +929,7 @@ vbuxx=_deref_pbuc1_bor_vbuc2 < vbuxx=vbuc2_bor__deref_pbuc1 < vbuaa=vbuc2_bor__d
 vbuxx=_deref_pbuc1_plus_vbuc2 < vbuxx=vbuc2_plus__deref_pbuc1 < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:8.0
   lda {c1}
   tax
-  axs #-{c2}
+  axs #-[{c2}]
 CANNOT SYNTHESIZE vbuxx=pbuz1_derefidx_vbuaa_bxor_vbuaa
 vbuxx=pbuz1_derefidx_vbuaa_band_vbuxx < vbuaa=pbuz1_derefidx_vbuaa_band_vbuxx < vbuaa=vbuxx_band_pbuz1_derefidx_vbuaa < vbuaa=vbuxx_band_pbuz1_derefidx_vbuyy < vbuaa=vbuaa_band_pbuz1_derefidx_vbuyy - clobber:A X Y  cycles:11.5
   tay
@@ -1760,7 +1760,7 @@ vbuxx=pbuc1_derefidx_vbuaa_plus_vbuc1 < vbuxx=pbuc1_derefidx_vbuxx_plus_vbuc1 <
   tax
   lda {c1},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=pbuc1_derefidx_vbuaa_bxor_vbuc2 < vbuxx=pbuc1_derefidx_vbuxx_bxor_vbuc2 < vbuxx=vbuc2_bxor_pbuc1_derefidx_vbuxx < vbuaa=vbuc2_bxor_pbuc1_derefidx_vbuxx < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuc2 < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuaa < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuxx - clobber:A X   cycles:10.5
   tax
   lda #{c2}
@@ -1770,7 +1770,7 @@ vbuxx=pbuc1_derefidx_vbuaa_plus_vbuc2 < vbuxx=pbuc1_derefidx_vbuxx_plus_vbuc2 <
   tax
   lda {c1},x
   tax
-  axs #-{c2}
+  axs #-[{c2}]
 vbuxx=pbuc1_derefidx_vbuxx_bxor_vbuaa < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuaa < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuxx - clobber:A X   cycles:6.5
   eor {c1},x
   tax
@@ -1962,7 +1962,7 @@ vbuxx=pbuc1_derefidx_vbuxx_bor_vbuc1 < vbuxx=vbuc1_bor_pbuc1_derefidx_vbuxx < vb
 vbuxx=pbuc1_derefidx_vbuxx_plus_vbuc1 < vbuxx=vbuc1_plus_pbuc1_derefidx_vbuxx < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:8.5
   lda {c1},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=pbuc1_derefidx_vbuxx_bxor_vbuc2 < vbuxx=vbuc2_bxor_pbuc1_derefidx_vbuxx < vbuaa=vbuc2_bxor_pbuc1_derefidx_vbuxx < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuc2 < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuaa < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuxx - clobber:A X   cycles:8.5
   lda #{c2}
   eor {c1},x
@@ -2157,7 +2157,7 @@ vbuxx=pbuc1_derefidx_vbuyy_bor_vbuc1 < vbuxx=vbuc1_bor_pbuc1_derefidx_vbuyy < vb
 vbuxx=pbuc1_derefidx_vbuyy_plus_vbuc1 < vbuxx=vbuc1_plus_pbuc1_derefidx_vbuyy < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:8.5
   lda {c1},y
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=pbuc1_derefidx_vbuyy_bxor_vbuc2 < vbuxx=vbuc2_bxor_pbuc1_derefidx_vbuyy < vbuxx=vbuaa_bxor_pbuc1_derefidx_vbuyy < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuyy - clobber:A X   cycles:8.5
   lda #{c2}
   eor {c1},y
@@ -2482,7 +2482,7 @@ vbuxx=pbuc1_derefidx_vbuz1_plus_vbuc1 < vbuxx=pbuc1_derefidx_vbuxx_plus_vbuc1 <
   ldx {z1}
   lda {c1},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=pbuc1_derefidx_vbuz1_bxor_vbuc2 < vbuxx=vbuc2_bxor_pbuc1_derefidx_vbuz1 < vbuaa=vbuc2_bxor_pbuc1_derefidx_vbuz1 < vbuaa=pbuc1_derefidx_vbuz1_bxor_vbuc2 < vbuaa=pbuc1_derefidx_vbuz1_bxor_vbuaa < vbuaa=pbuc1_derefidx_vbuxx_bxor_vbuaa < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuxx - clobber:A X   cycles:11.5
   lda #{c2}
   ldx {z1}
@@ -2492,7 +2492,7 @@ vbuxx=pbuc1_derefidx_vbuz1_plus_vbuc2 < vbuxx=pbuc1_derefidx_vbuxx_plus_vbuc2 <
   ldx {z1}
   lda {c1},x
   tax
-  axs #-{c2}
+  axs #-[{c2}]
 CANNOT SYNTHESIZE vbuxx=pbuc1_derefidx_vbuc1_bxor_vbuaa
 CANNOT SYNTHESIZE vbuxx=pbuc1_derefidx_vbuc1_band_vbuxx
 CANNOT SYNTHESIZE vbuxx=pbuc1_derefidx_vbuc1_minus_vbuxx
@@ -2852,7 +2852,7 @@ vbuxx=pbuc1_derefidx_vbuc2_plus_vbuc3 < vbuxx=vbuc3_plus_pbuc1_derefidx_vbuc2 <
   ldx #{c2}
   lda {c1},x
   tax
-  axs #-{c3}
+  axs #-[{c3}]
 vbuxx=vbuc1_bxor_vbuaa < vbuxx=vbuaa_bxor_vbuc1 < vbuaa=vbuaa_bxor_vbuc1 - clobber:A X   cycles:4.0
   eor #{c1}
   tax
@@ -2872,14 +2872,14 @@ vbuxx=vbuc1_bor_vbuyy < vbuxx=vbuyy_bor_vbuc1 < vbuaa=vbuyy_bor_vbuc1 < vbuaa=vb
 vbuxx=vbuc1_plus_vbuyy < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:6.0
   tya
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=vbuc1_bor_vbuz1 < vbuaa=vbuc1_bor_vbuz1 < vbuaa=vbuz1_bor_vbuc1 < vbuaa=vbuz1_bor_vbuaa < vbuaa=vbuaa_bor_vbuz1 - clobber:A X   cycles:7.0
   lda #{c1}
   ora {z1}
   tax
 vbuxx=vbuc1_plus_vbuz1 < vbuxx=vbuz1_plus_vbuc1 - clobber:A X   cycles:5.0
   lax {z1}
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=vbuc1_bxor__deref_pbuz1 < vbuxx=_deref_pbuz1_bxor_vbuc1 < vbuaa=_deref_pbuz1_bxor_vbuc1 < vbuaa=vbuc1_bxor__deref_pbuz1 < vbuaa=vbuaa_bxor__deref_pbuz1 - clobber:A X Y  cycles:11.5
   lda #{c1}
   ldy #0
@@ -2952,7 +2952,7 @@ vbuxx=vbuc1_bor_pbuc1_derefidx_vbuxx < vbuaa=vbuc1_bor_pbuc1_derefidx_vbuxx < vb
 vbuxx=vbuc1_plus_pbuc1_derefidx_vbuxx < vbuxx=vbuc1_plus_vbuaa < vbuxx=vbuaa_plus_vbuc1 - clobber:A X   cycles:8.5
   lda {c1},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=vbuc1_bxor_pbuc1_derefidx_vbuyy < vbuxx=pbuc1_derefidx_vbuyy_bxor_vbuc1 < vbuxx=vbuaa_bxor_vbuc1 < vbuaa=vbuaa_bxor_vbuc1 - clobber:A X   cycles:8.5
   lda {c1},y
   eor #{c1}
@@ -2979,7 +2979,7 @@ vbuxx=vbuc1_plus_pbuc1_derefidx_vbuc2 < vbuxx=pbuc1_derefidx_vbuc2_plus_vbuc1 <
   ldx #{c2}
   lda {c1},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 vbuxx=vbuc1_bxor_pbuc2_derefidx_vbuaa < vbuxx=vbuc1_bxor_pbuc2_derefidx_vbuxx < vbuxx=pbuc2_derefidx_vbuxx_bxor_vbuc1 < vbuaa=pbuc2_derefidx_vbuxx_bxor_vbuc1 < vbuaa=vbuc1_bxor_pbuc2_derefidx_vbuxx < vbuaa=vbuaa_bxor_pbuc1_derefidx_vbuxx - clobber:A X   cycles:10.5
   tax
   lda #{c1}
@@ -3012,7 +3012,7 @@ vbuxx=vbuc1_plus_pbuc2_derefidx_vbuz1 < vbuxx=vbuc1_plus_pbuc2_derefidx_vbuxx <
   ldx {z1}
   lda {c2},x
   tax
-  axs #-{c1}
+  axs #-[{c1}]
 CANNOT SYNTHESIZE vbuxx=vbuc1_bxor_pbuc2_derefidx_vbuc1
 CANNOT SYNTHESIZE vbuxx=vbuc1_band_pbuc2_derefidx_vbuc2
 CANNOT SYNTHESIZE vbuxx=vbuc1_bxor_pbuc2_derefidx_vbuc2
diff --git a/src/test/ref/fragments-assignment-binary-vbuz1.log b/src/test/ref/fragments-assignment-binary-vbuz1.log
index b14c8eab9..1b6065097 100644
--- a/src/test/ref/fragments-assignment-binary-vbuz1.log
+++ b/src/test/ref/fragments-assignment-binary-vbuz1.log
@@ -197,7 +197,7 @@ vbuz1=vbuxx_plus_vbuc1 < vbuz1=vbuaa_plus_vbuc1 < vbuaa=vbuaa_plus_vbuc1 - clobb
   sta {z1}
 vbuz1=vbuxx_plus_vbuc1 < vbuxx=vbuxx_plus_vbuc1 - clobber:A X   cycles:7.0
   txa
-  axs #-{c1}
+  axs #-[{c1}]
   stx {z1}
 vbuz1=vbuyy_band_vbuxx < vbuz1=vbuaa_band_vbuxx - clobber:A   cycles:5.0
   tya
@@ -408,7 +408,7 @@ vbuz1=vbuz1_plus_vbuc1 < vbuz1=vbuc1_plus_vbuz1 < vbuaa=vbuc1_plus_vbuz1 < vbuaa
   sta {z1}
 vbuz1=vbuz1_plus_vbuc1 < vbuz1=vbuc1_plus_vbuz1 < vbuz1=vbuc1_plus_vbuz2 < vbuxx=vbuc1_plus_vbuz1 < vbuxx=vbuz1_plus_vbuc1 - clobber:A X   cycles:8.0
   lax {z1}
-  axs #-{c1}
+  axs #-[{c1}]
   stx {z1}
 vbuz1=vbuz2_band_vbuxx < vbuz1=vbuaa_band_vbuxx - clobber:A   cycles:6.0
   lda {z2}
@@ -561,7 +561,7 @@ vbuz1=vbuz2_plus_vbuc1 < vbuz1=vbuz2_plus_vbuaa < vbuz1=vbuaa_plus_vbuz2 < vbuaa
   sta {z1}
 vbuz1=vbuz2_plus_vbuc1 < vbuxx=vbuz1_plus_vbuc1 - clobber:A X   cycles:8.0
   lax {z2}
-  axs #-{c1}
+  axs #-[{c1}]
   stx {z1}
 vbuz1=_deref_pbuz1_band_vbuxx < vbuz1=vbuaa_band_vbuxx - clobber:A Y  cycles:10.5
   ldy #0
diff --git a/src/test/ref/iterarray.log b/src/test/ref/iterarray.log
index a6ef2f6d1..44f76dcec 100644
--- a/src/test/ref/iterarray.log
+++ b/src/test/ref/iterarray.log
@@ -163,7 +163,7 @@ main: {
   b1:
   //SEG16 [6] (byte/signed word/word/dword/signed dword~) main::$1 ← (byte) main::i#2 + (byte/signed byte/word/signed word/dword/signed dword) 2+(byte/signed byte/word/signed word/dword/signed dword) 2 -- vbuz1=vbuz2_plus_vbuc1 
     lax i
-    axs #-2+2
+    axs #-[2+2]
     stx _1
   //SEG17 [7] *((const byte[$10]) main::buf#0 + (byte) main::i#2) ← (byte/signed word/word/dword/signed dword~) main::$1 -- pbuc1_derefidx_vbuz1=vbuz2 
     lda _1
diff --git a/src/test/ref/liverange.log b/src/test/ref/liverange.log
index 823b669a5..5dede1495 100644
--- a/src/test/ref/liverange.log
+++ b/src/test/ref/liverange.log
@@ -292,7 +292,7 @@ main: {
     sta _0
   //SEG17 [8] (byte) main::a#1 ← (byte/signed byte/word/signed word/dword/signed dword) 4 + (byte~) main::$0 -- vbuz1=vbuc1_plus_vbuz2 
     lax _0
-    axs #-4
+    axs #-[4]
     stx a
   //SEG18 [9] call inci 
   //SEG19 [16] phi from main::@1 to inci [phi:main::@1->inci]
@@ -332,7 +332,7 @@ inci: {
     .label return_2 = 9
   //SEG30 [17] (byte) i#11 ← (byte) i#10 + (byte/signed byte/word/signed word/dword/signed dword) 7 -- vbuz1=vbuz1_plus_vbuc1 
     lax i
-    axs #-7
+    axs #-[7]
     stx i
   //SEG31 [18] (byte) inci::return#2 ← (byte) i#11 -- vbuz1=vbuz2 
     lda i
diff --git a/src/test/ref/overlap-allocation-2.asm b/src/test/ref/overlap-allocation-2.asm
index 10e63e87f..1d7d8b835 100644
--- a/src/test/ref/overlap-allocation-2.asm
+++ b/src/test/ref/overlap-allocation-2.asm
@@ -26,7 +26,7 @@ main: {
 line: {
     jsr plot
     txa
-    axs #-$14
+    axs #-[$14]
     jsr plot
     rts
 }
diff --git a/src/test/ref/overlap-allocation-2.log b/src/test/ref/overlap-allocation-2.log
index a87da3c94..53870c4b5 100644
--- a/src/test/ref/overlap-allocation-2.log
+++ b/src/test/ref/overlap-allocation-2.log
@@ -360,7 +360,7 @@ line: {
   b1:
   //SEG43 [19] (byte) plot::x#1 ← (byte) line::l#2 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuz1=vbuz2_plus_vbuc1 
     lax l
-    axs #-$14
+    axs #-[$14]
     stx plot.x
   //SEG44 [20] call plot 
   //SEG45 [22] phi from line::@1 to plot [phi:line::@1->plot]
@@ -516,7 +516,7 @@ line: {
   b1:
   //SEG43 [19] (byte) plot::x#1 ← (byte) line::l#2 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$14
+    axs #-[$14]
   //SEG44 [20] call plot 
   //SEG45 [22] phi from line::@1 to plot [phi:line::@1->plot]
   plot_from_b1:
@@ -698,7 +698,7 @@ line: {
   //SEG42 line::@1
   //SEG43 [19] (byte) plot::x#1 ← (byte) line::l#2 + (byte/signed byte/word/signed word/dword/signed dword) $14 -- vbuxx=vbuxx_plus_vbuc1 
     txa
-    axs #-$14
+    axs #-[$14]
   //SEG44 [20] call plot 
   //SEG45 [22] phi from line::@1 to plot [phi:line::@1->plot]
   //SEG46 [22] phi (byte) plot::x#2 = (byte) plot::x#1 [phi:line::@1->plot#0] -- register_copy 
diff --git a/src/test/ref/sinusgenscale8.asm b/src/test/ref/sinusgenscale8.asm
index 09c954b45..a9c93936e 100644
--- a/src/test/ref/sinusgenscale8.asm
+++ b/src/test/ref/sinusgenscale8.asm
@@ -109,7 +109,7 @@ sin8u_table: {
     jsr mul8su
     lda sinx_sc+1
     tax
-    axs #-mid
+    axs #-[mid]
     txa
     ldy #0
     sta (sintab),y
diff --git a/src/test/ref/sinusgenscale8.log b/src/test/ref/sinusgenscale8.log
index 52c78f8d6..bf7fc798e 100644
--- a/src/test/ref/sinusgenscale8.log
+++ b/src/test/ref/sinusgenscale8.log
@@ -3791,7 +3791,7 @@ sin8u_table: {
     sta _21
   //SEG108 [44] (byte) sin8u_table::sinx_tr#0 ← (const byte) sin8u_table::mid#0 + (byte~) sin8u_table::$21 -- vbuz1=vbuc1_plus_vbuz2 
     lax _21
-    axs #-mid
+    axs #-[mid]
     stx sinx_tr
   //SEG109 [45] *((byte*) sin8u_table::sintab#2) ← (byte) sin8u_table::sinx_tr#0 -- _deref_pbuz1=vbuz2 
     lda sinx_tr
@@ -5537,7 +5537,7 @@ sin8u_table: {
     lda sinx_sc+1
   //SEG108 [44] (byte) sin8u_table::sinx_tr#0 ← (const byte) sin8u_table::mid#0 + (byte~) sin8u_table::$21 -- vbuxx=vbuc1_plus_vbuaa 
     tax
-    axs #-mid
+    axs #-[mid]
   //SEG109 [45] *((byte*) sin8u_table::sintab#2) ← (byte) sin8u_table::sinx_tr#0 -- _deref_pbuz1=vbuxx 
     txa
     ldy #0
@@ -7443,7 +7443,7 @@ sin8u_table: {
     lda sinx_sc+1
   //SEG108 [44] (byte) sin8u_table::sinx_tr#0 ← (const byte) sin8u_table::mid#0 + (byte~) sin8u_table::$21 -- vbuxx=vbuc1_plus_vbuaa 
     tax
-    axs #-mid
+    axs #-[mid]
   //SEG109 [45] *((byte*) sin8u_table::sintab#2) ← (byte) sin8u_table::sinx_tr#0 -- _deref_pbuz1=vbuxx 
     txa
     ldy #0
diff --git a/src/test/ref/test-comments-block.log b/src/test/ref/test-comments-block.log
index c1b12665d..7a8174488 100644
--- a/src/test/ref/test-comments-block.log
+++ b/src/test/ref/test-comments-block.log
@@ -317,7 +317,7 @@ sum: {
     .label return_1 = 7
   //SEG30 [15] (byte) sum::return#1 ← (const byte) a#0 + (byte) sum::b#0 -- vbuz1=vbuc1_plus_vbuz2 
     lax b
-    axs #-a
+    axs #-[a]
     stx return_1
     jmp breturn
   //SEG31 sum::@return
diff --git a/src/test/ref/test-comments-single.log b/src/test/ref/test-comments-single.log
index bcce2d21d..c273020c0 100644
--- a/src/test/ref/test-comments-single.log
+++ b/src/test/ref/test-comments-single.log
@@ -315,7 +315,7 @@ sum: {
     .label return_1 = 7
   //SEG30 [15] (byte) sum::return#1 ← (const byte) a#0 + (byte) sum::b#0 -- vbuz1=vbuc1_plus_vbuz2 
     lax b
-    axs #-a
+    axs #-[a]
     stx return_1
     jmp breturn
   //SEG31 sum::@return
diff --git a/src/test/ref/test-comparisons.asm b/src/test/ref/test-comparisons.asm
index bba880831..1eea230d5 100644
--- a/src/test/ref/test-comparisons.asm
+++ b/src/test/ref/test-comparisons.asm
@@ -357,7 +357,7 @@ main: {
     jsr printu
     jsr print_ln
     lax a
-    axs #-$30
+    axs #-[$30]
     stx a
     inc i
     lda #5
diff --git a/src/test/ref/test-comparisons.log b/src/test/ref/test-comparisons.log
index 49a127180..34d06b383 100644
--- a/src/test/ref/test-comparisons.log
+++ b/src/test/ref/test-comparisons.log
@@ -4199,7 +4199,7 @@ main: {
   b70:
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
-    axs #-$30
+    axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
@@ -5742,7 +5742,7 @@ main: {
   b70:
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
-    axs #-$30
+    axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i
@@ -7360,7 +7360,7 @@ main: {
   //SEG423 main::@70
   //SEG424 [157] (byte) main::a#1 ← (byte) main::a#10 + (byte/signed byte/word/signed word/dword/signed dword) $30 -- vbuz1=vbuz1_plus_vbuc1 
     lax a
-    axs #-$30
+    axs #-[$30]
     stx a
   //SEG425 [158] (byte) main::i#1 ← ++ (byte) main::i#10 -- vbuz1=_inc_vbuz1 
     inc i