From 7f6b0a0e898c0743b45a18a625a46fb1aefce524 Mon Sep 17 00:00:00 2001 From: jespergravgaard Date: Wed, 1 Jul 2020 23:38:28 +0200 Subject: [PATCH] Finished better ASM fragment handling for pointer to pointer. Closes #484 --- src/main/fragment/cache/fragment-cache-mos6502.asm | 2 +- ...y=vbuaa.asm => (_deref_qbuc1)_derefidx_vbuyy=vbuaa.asm} | 0 ...ef_(_deref_qbuc1)=_deref_(_deref_qbuc1)_plus_vbuaa.asm} | 0 ...ef_pptc1)=vbuaa.asm => _deref_(_deref_qbuc1)=vbuaa.asm} | 0 ...)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuxx)=vbuaa.asm} | 0 ...efidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm} | 0 ...)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm} | 0 ...)=vbuaa.asm => _deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm} | 0 .../_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm | 5 ----- .../_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm | 5 ----- .../_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm | 5 ----- ...buyy.asm => _deref_pvoc1=_deref_pvoc2_memcpy_vbuyy.asm} | 0 ...buxx.asm => _deref_pvoc1=_deref_qvoc2_memcpy_vbuxx.asm} | 0 ...buyy.asm => _deref_pvoc1=_deref_qvoc2_memcpy_vbuyy.asm} | 0 ...c1=_memset_vbuxx.asm => _deref_pvoc1=_memset_vbuxx.asm} | 0 ...c1=_memset_vbuyy.asm => _deref_pvoc1=_memset_vbuyy.asm} | 0 ... => _deref_pvoc1=pvoc2_derefidx_vbuxx_memcpy_vbuc3.asm} | 0 ... => _deref_pvoc1=pvoc2_derefidx_vbuyy_memcpy_vbuc3.asm} | 0 ...buc1.asm => _deref_pvoz1=_deref_pvoz2_memcpy_vbuc1.asm} | 0 ...buxx.asm => _deref_pvoz1=_deref_pvoz2_memcpy_vbuxx.asm} | 0 ...z1_then_la1.asm => pvoc1_neq__deref_qvoz1_then_la1.asm} | 0 ...tc1_then_la1.asm => pvom1_ge__deref_qvoc1_then_la1.asm} | 0 .../{pvoz1=_deref_pptz1.asm => pvoz1=_deref_qvoz1.asm} | 0 ...z1_plus_vbuaa.asm => pvoz1=_deref_qvoz1_plus_vbuaa.asm} | 0 ...1_derefidx_vbuyy.asm => pvoz1=qvoz1_derefidx_vbuyy.asm} | 0 ...pwuc1_derefidx_vbuyy=(_deref_qwuc2)_derefidx_vbuyy.asm} | 0 .../fragment/mos6502-common/qvom1=qvom1_plus_vwum2.asm | 7 +++++++ .../fragment/mos6502-common/qvom1=qvom2_plus_vwum3.asm | 7 +++++++ .../fragment/mos6502-common/qvom1=vwum1_plus_qvom2.asm | 7 +++++++ ...x_vbuyy.asm => vbuaa=(_deref_qbuc1)_derefidx_vbuyy.asm} | 0 ...asm => vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbum2.asm} | 0 ...asm => vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbuxx.asm} | 0 ..._(_deref_pptc1).asm => vbuaa=_deref_(_deref_qbuc1).asm} | 0 ...uaa=_hi__deref_pptz1.asm => vbuaa=_hi__deref_qvoz1.asm} | 0 ...refidx_vbuc1.asm => vbuaa=_hi_qvoz1_derefidx_vbuc1.asm} | 0 ...uaa=_lo__deref_pptz1.asm => vbuaa=_lo__deref_qvoz1.asm} | 0 ...refidx_vbuc1.asm => vbuaa=_lo_qvoz1_derefidx_vbuc1.asm} | 0 ...neq_(qbuz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm} | 0 ...neq_(qbuz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm} | 0 .../{vdum1=_deref_pptc1.asm => vdum1=_deref_qvoc1.asm} | 0 ...word__deref_pptc1.asm => vdum1=_dword__deref_qvoc1.asm} | 0 ...x_vbuyy.asm => vwum1=(_deref_qwuc1)_derefidx_vbuyy.asm} | 0 .../{vwum1=_deref_pptz2.asm => vwum1=_deref_qvoz2.asm} | 0 ...2_derefidx_vbuyy.asm => vwum1=qvoz2_derefidx_vbuyy.asm} | 0 ...__deref_pptc1.asm => vwum1=vwum2_plus__deref_qvoc1.asm} | 0 .../mos6502-selfmod/_deref_(_deref_pptz1)=vbuaa.asm | 4 ---- ...)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm} | 0 ...)=vbuxx.asm => _deref_(qbuz1_derefidx_vbuc1)=vbuxx.asm} | 0 ...)=vbuaa.asm => _deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm} | 0 .../vbuaa=_lo__deref_pptc1_derefidx_vbuxx.asm | 5 ----- .../vbuaa=_lo__deref_pptc1_derefidx_vbuyy.asm | 5 ----- 51 files changed, 22 insertions(+), 30 deletions(-) rename src/main/fragment/mos6502-common/{(_deref_pptc1)_derefidx_vbuyy=vbuaa.asm => (_deref_qbuc1)_derefidx_vbuyy=vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(_deref_pptc1)=_deref_(_deref_pptc1)_plus_vbuaa.asm => _deref_(_deref_qbuc1)=_deref_(_deref_qbuc1)_plus_vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(_deref_pptc1)=vbuaa.asm => _deref_(_deref_qbuc1)=vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(pptc1_derefidx_vbuxx)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuxx)=vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(pptc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm => _deref_(qbuc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm => _deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm} (100%) delete mode 100644 src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm delete mode 100644 src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm delete mode 100644 src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm rename src/main/fragment/mos6502-common/{_deref_pbuc1=_deref_pbuc2_memcpy_vbuyy.asm => _deref_pvoc1=_deref_pvoc2_memcpy_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pbuc1=_deref_pbuc2_memcpy_vbuxx.asm => _deref_pvoc1=_deref_qvoc2_memcpy_vbuxx.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pbuc1=_deref_pptc2_memcpy_vbuyy.asm => _deref_pvoc1=_deref_qvoc2_memcpy_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssc1=_memset_vbuxx.asm => _deref_pvoc1=_memset_vbuxx.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssc1=_memset_vbuyy.asm => _deref_pvoc1=_memset_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssc1=pssc2_derefidx_vbuxx_memcpy_vbuc3.asm => _deref_pvoc1=pvoc2_derefidx_vbuxx_memcpy_vbuc3.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssc1=pssc2_derefidx_vbuyy_memcpy_vbuc3.asm => _deref_pvoc1=pvoc2_derefidx_vbuyy_memcpy_vbuc3.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssz1=_deref_pssz2_memcpy_vbuc1.asm => _deref_pvoz1=_deref_pvoz2_memcpy_vbuc1.asm} (100%) rename src/main/fragment/mos6502-common/{_deref_pssz1=_deref_pssz2_memcpy_vbuxx.asm => _deref_pvoz1=_deref_pvoz2_memcpy_vbuxx.asm} (100%) rename src/main/fragment/mos6502-common/{pvoc1_neq__deref_pptz1_then_la1.asm => pvoc1_neq__deref_qvoz1_then_la1.asm} (100%) rename src/main/fragment/mos6502-common/{pvom1_ge__deref_pptc1_then_la1.asm => pvom1_ge__deref_qvoc1_then_la1.asm} (100%) rename src/main/fragment/mos6502-common/{pvoz1=_deref_pptz1.asm => pvoz1=_deref_qvoz1.asm} (100%) rename src/main/fragment/mos6502-common/{pvoz1=_deref_pptz1_plus_vbuaa.asm => pvoz1=_deref_qvoz1_plus_vbuaa.asm} (100%) rename src/main/fragment/mos6502-common/{pvoz1=pptz1_derefidx_vbuyy.asm => pvoz1=qvoz1_derefidx_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{pwuc1_derefidx_vbuyy=(_deref_pptc2)_derefidx_vbuyy.asm => pwuc1_derefidx_vbuyy=(_deref_qwuc2)_derefidx_vbuyy.asm} (100%) create mode 100644 src/main/fragment/mos6502-common/qvom1=qvom1_plus_vwum2.asm create mode 100644 src/main/fragment/mos6502-common/qvom1=qvom2_plus_vwum3.asm create mode 100644 src/main/fragment/mos6502-common/qvom1=vwum1_plus_qvom2.asm rename src/main/fragment/mos6502-common/{vbuaa=(_deref_pptc1)_derefidx_vbuyy.asm => vbuaa=(_deref_qbuc1)_derefidx_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbum2.asm => vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbum2.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbuxx.asm => vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbuxx.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=_deref_(_deref_pptc1).asm => vbuaa=_deref_(_deref_qbuc1).asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=_hi__deref_pptz1.asm => vbuaa=_hi__deref_qvoz1.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=_hi_pptz1_derefidx_vbuc1.asm => vbuaa=_hi_qvoz1_derefidx_vbuc1.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=_lo__deref_pptz1.asm => vbuaa=_lo__deref_qvoz1.asm} (100%) rename src/main/fragment/mos6502-common/{vbuaa=_lo_pptz1_derefidx_vbuc1.asm => vbuaa=_lo_qvoz1_derefidx_vbuc1.asm} (100%) rename src/main/fragment/mos6502-common/{vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm => vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm} (100%) rename src/main/fragment/mos6502-common/{vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm => vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm} (100%) rename src/main/fragment/mos6502-common/{vdum1=_deref_pptc1.asm => vdum1=_deref_qvoc1.asm} (100%) rename src/main/fragment/mos6502-common/{vdum1=_dword__deref_pptc1.asm => vdum1=_dword__deref_qvoc1.asm} (100%) rename src/main/fragment/mos6502-common/{vwum1=(_deref_pptc1)_derefidx_vbuyy.asm => vwum1=(_deref_qwuc1)_derefidx_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{vwum1=_deref_pptz2.asm => vwum1=_deref_qvoz2.asm} (100%) rename src/main/fragment/mos6502-common/{vwum1=pptz2_derefidx_vbuyy.asm => vwum1=qvoz2_derefidx_vbuyy.asm} (100%) rename src/main/fragment/mos6502-common/{vwum1=vwum2_plus__deref_pptc1.asm => vwum1=vwum2_plus__deref_qvoc1.asm} (100%) delete mode 100644 src/main/fragment/mos6502-selfmod/_deref_(_deref_pptz1)=vbuaa.asm rename src/main/fragment/mos6502-selfmod/{_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm => _deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm} (100%) rename src/main/fragment/mos6502-selfmod/{_deref_(pptz1_derefidx_vbuc1)=vbuxx.asm => _deref_(qbuz1_derefidx_vbuc1)=vbuxx.asm} (100%) rename src/main/fragment/mos6502-selfmod/{_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm => _deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm} (100%) delete mode 100644 src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuxx.asm delete mode 100644 src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuyy.asm diff --git a/src/main/fragment/cache/fragment-cache-mos6502.asm b/src/main/fragment/cache/fragment-cache-mos6502.asm index 369bb5774..3348fcba2 100644 --- a/src/main/fragment/cache/fragment-cache-mos6502.asm +++ b/src/main/fragment/cache/fragment-cache-mos6502.asm @@ -1,4 +1,4 @@ -//KICKC FRAGMENT CACHE 125a7c9d20 +//KICKC FRAGMENT CACHE 1674dfb83d //FRAGMENT vbuz1=vbuc1 lda #{c1} sta {z1} diff --git a/src/main/fragment/mos6502-common/(_deref_pptc1)_derefidx_vbuyy=vbuaa.asm b/src/main/fragment/mos6502-common/(_deref_qbuc1)_derefidx_vbuyy=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/(_deref_pptc1)_derefidx_vbuyy=vbuaa.asm rename to src/main/fragment/mos6502-common/(_deref_qbuc1)_derefidx_vbuyy=vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_(_deref_pptc1)=_deref_(_deref_pptc1)_plus_vbuaa.asm b/src/main/fragment/mos6502-common/_deref_(_deref_qbuc1)=_deref_(_deref_qbuc1)_plus_vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(_deref_pptc1)=_deref_(_deref_pptc1)_plus_vbuaa.asm rename to src/main/fragment/mos6502-common/_deref_(_deref_qbuc1)=_deref_(_deref_qbuc1)_plus_vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_(_deref_pptc1)=vbuaa.asm b/src/main/fragment/mos6502-common/_deref_(_deref_qbuc1)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(_deref_pptc1)=vbuaa.asm rename to src/main/fragment/mos6502-common/_deref_(_deref_qbuc1)=vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuxx)=vbuaa.asm b/src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuxx)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuxx)=vbuaa.asm rename to src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuxx)=vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm b/src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm rename to src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuyy)=pbuc2_derefidx_(pbuc3_derefidx_vbuxx).asm diff --git a/src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm b/src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm rename to src/main/fragment/mos6502-common/_deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm b/src/main/fragment/mos6502-common/_deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm rename to src/main/fragment/mos6502-common/_deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm diff --git a/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm b/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm deleted file mode 100644 index 9bbdc0a69..000000000 --- a/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuxx.asm +++ /dev/null @@ -1,5 +0,0 @@ -!: -lda {c2}-1,x -sta {c1}-1,x -dex -bne !- \ No newline at end of file diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm b/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm deleted file mode 100644 index 9bbdc0a69..000000000 --- a/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuxx.asm +++ /dev/null @@ -1,5 +0,0 @@ -!: -lda {c2}-1,x -sta {c1}-1,x -dex -bne !- \ No newline at end of file diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm b/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm deleted file mode 100644 index 282cdf4cf..000000000 --- a/src/main/fragment/mos6502-common/_deref_pssc1=_deref_pssc2_memcpy_vbuyy.asm +++ /dev/null @@ -1,5 +0,0 @@ -!: -lda {c2}-1,y -sta {c1}-1,y -dey -bne !- \ No newline at end of file diff --git a/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuyy.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=_deref_pvoc2_memcpy_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuyy.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=_deref_pvoc2_memcpy_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuxx.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=_deref_qvoc2_memcpy_vbuxx.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pbuc2_memcpy_vbuxx.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=_deref_qvoc2_memcpy_vbuxx.asm diff --git a/src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuyy.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=_deref_qvoc2_memcpy_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pbuc1=_deref_pptc2_memcpy_vbuyy.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=_deref_qvoc2_memcpy_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuxx.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=_memset_vbuxx.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuxx.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=_memset_vbuxx.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuyy.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=_memset_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssc1=_memset_vbuyy.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=_memset_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuxx_memcpy_vbuc3.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=pvoc2_derefidx_vbuxx_memcpy_vbuc3.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuxx_memcpy_vbuc3.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=pvoc2_derefidx_vbuxx_memcpy_vbuc3.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuyy_memcpy_vbuc3.asm b/src/main/fragment/mos6502-common/_deref_pvoc1=pvoc2_derefidx_vbuyy_memcpy_vbuc3.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssc1=pssc2_derefidx_vbuyy_memcpy_vbuc3.asm rename to src/main/fragment/mos6502-common/_deref_pvoc1=pvoc2_derefidx_vbuyy_memcpy_vbuc3.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuc1.asm b/src/main/fragment/mos6502-common/_deref_pvoz1=_deref_pvoz2_memcpy_vbuc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuc1.asm rename to src/main/fragment/mos6502-common/_deref_pvoz1=_deref_pvoz2_memcpy_vbuc1.asm diff --git a/src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuxx.asm b/src/main/fragment/mos6502-common/_deref_pvoz1=_deref_pvoz2_memcpy_vbuxx.asm similarity index 100% rename from src/main/fragment/mos6502-common/_deref_pssz1=_deref_pssz2_memcpy_vbuxx.asm rename to src/main/fragment/mos6502-common/_deref_pvoz1=_deref_pvoz2_memcpy_vbuxx.asm diff --git a/src/main/fragment/mos6502-common/pvoc1_neq__deref_pptz1_then_la1.asm b/src/main/fragment/mos6502-common/pvoc1_neq__deref_qvoz1_then_la1.asm similarity index 100% rename from src/main/fragment/mos6502-common/pvoc1_neq__deref_pptz1_then_la1.asm rename to src/main/fragment/mos6502-common/pvoc1_neq__deref_qvoz1_then_la1.asm diff --git a/src/main/fragment/mos6502-common/pvom1_ge__deref_pptc1_then_la1.asm b/src/main/fragment/mos6502-common/pvom1_ge__deref_qvoc1_then_la1.asm similarity index 100% rename from src/main/fragment/mos6502-common/pvom1_ge__deref_pptc1_then_la1.asm rename to src/main/fragment/mos6502-common/pvom1_ge__deref_qvoc1_then_la1.asm diff --git a/src/main/fragment/mos6502-common/pvoz1=_deref_pptz1.asm b/src/main/fragment/mos6502-common/pvoz1=_deref_qvoz1.asm similarity index 100% rename from src/main/fragment/mos6502-common/pvoz1=_deref_pptz1.asm rename to src/main/fragment/mos6502-common/pvoz1=_deref_qvoz1.asm diff --git a/src/main/fragment/mos6502-common/pvoz1=_deref_pptz1_plus_vbuaa.asm b/src/main/fragment/mos6502-common/pvoz1=_deref_qvoz1_plus_vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-common/pvoz1=_deref_pptz1_plus_vbuaa.asm rename to src/main/fragment/mos6502-common/pvoz1=_deref_qvoz1_plus_vbuaa.asm diff --git a/src/main/fragment/mos6502-common/pvoz1=pptz1_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/pvoz1=qvoz1_derefidx_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/pvoz1=pptz1_derefidx_vbuyy.asm rename to src/main/fragment/mos6502-common/pvoz1=qvoz1_derefidx_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/pwuc1_derefidx_vbuyy=(_deref_pptc2)_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/pwuc1_derefidx_vbuyy=(_deref_qwuc2)_derefidx_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/pwuc1_derefidx_vbuyy=(_deref_pptc2)_derefidx_vbuyy.asm rename to src/main/fragment/mos6502-common/pwuc1_derefidx_vbuyy=(_deref_qwuc2)_derefidx_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/qvom1=qvom1_plus_vwum2.asm b/src/main/fragment/mos6502-common/qvom1=qvom1_plus_vwum2.asm new file mode 100644 index 000000000..558cb8bc3 --- /dev/null +++ b/src/main/fragment/mos6502-common/qvom1=qvom1_plus_vwum2.asm @@ -0,0 +1,7 @@ +lda {m1} +clc +adc {m2} +sta {m1} +lda {m1}+1 +adc {m2}+1 +sta {m1}+1 diff --git a/src/main/fragment/mos6502-common/qvom1=qvom2_plus_vwum3.asm b/src/main/fragment/mos6502-common/qvom1=qvom2_plus_vwum3.asm new file mode 100644 index 000000000..79a359c55 --- /dev/null +++ b/src/main/fragment/mos6502-common/qvom1=qvom2_plus_vwum3.asm @@ -0,0 +1,7 @@ +lda {m2} +clc +adc {m3} +sta {m1} +lda {m2}+1 +adc {m3}+1 +sta {m1}+1 diff --git a/src/main/fragment/mos6502-common/qvom1=vwum1_plus_qvom2.asm b/src/main/fragment/mos6502-common/qvom1=vwum1_plus_qvom2.asm new file mode 100644 index 000000000..558cb8bc3 --- /dev/null +++ b/src/main/fragment/mos6502-common/qvom1=vwum1_plus_qvom2.asm @@ -0,0 +1,7 @@ +lda {m1} +clc +adc {m2} +sta {m1} +lda {m1}+1 +adc {m2}+1 +sta {m1}+1 diff --git a/src/main/fragment/mos6502-common/vbuaa=(_deref_pptc1)_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/vbuaa=(_deref_qbuc1)_derefidx_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=(_deref_pptc1)_derefidx_vbuyy.asm rename to src/main/fragment/mos6502-common/vbuaa=(_deref_qbuc1)_derefidx_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbum2.asm b/src/main/fragment/mos6502-common/vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbum2.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbum2.asm rename to src/main/fragment/mos6502-common/vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbum2.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbuxx.asm b/src/main/fragment/mos6502-common/vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbuxx.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=(pptz1_derefidx_vbuyy)_derefidx_vbuxx.asm rename to src/main/fragment/mos6502-common/vbuaa=(qbuz1_derefidx_vbuyy)_derefidx_vbuxx.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=_deref_(_deref_pptc1).asm b/src/main/fragment/mos6502-common/vbuaa=_deref_(_deref_qbuc1).asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=_deref_(_deref_pptc1).asm rename to src/main/fragment/mos6502-common/vbuaa=_deref_(_deref_qbuc1).asm diff --git a/src/main/fragment/mos6502-common/vbuaa=_hi__deref_pptz1.asm b/src/main/fragment/mos6502-common/vbuaa=_hi__deref_qvoz1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=_hi__deref_pptz1.asm rename to src/main/fragment/mos6502-common/vbuaa=_hi__deref_qvoz1.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=_hi_pptz1_derefidx_vbuc1.asm b/src/main/fragment/mos6502-common/vbuaa=_hi_qvoz1_derefidx_vbuc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=_hi_pptz1_derefidx_vbuc1.asm rename to src/main/fragment/mos6502-common/vbuaa=_hi_qvoz1_derefidx_vbuc1.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=_lo__deref_pptz1.asm b/src/main/fragment/mos6502-common/vbuaa=_lo__deref_qvoz1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=_lo__deref_pptz1.asm rename to src/main/fragment/mos6502-common/vbuaa=_lo__deref_qvoz1.asm diff --git a/src/main/fragment/mos6502-common/vbuaa=_lo_pptz1_derefidx_vbuc1.asm b/src/main/fragment/mos6502-common/vbuaa=_lo_qvoz1_derefidx_vbuc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuaa=_lo_pptz1_derefidx_vbuc1.asm rename to src/main/fragment/mos6502-common/vbuaa=_lo_qvoz1_derefidx_vbuc1.asm diff --git a/src/main/fragment/mos6502-common/vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm b/src/main/fragment/mos6502-common/vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm rename to src/main/fragment/mos6502-common/vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbum2_then_la1.asm diff --git a/src/main/fragment/mos6502-common/vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm b/src/main/fragment/mos6502-common/vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vbuc1_neq_(pptz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm rename to src/main/fragment/mos6502-common/vbuc1_neq_(qbuz1_derefidx_vbuyy)_derefidx_vbuxx_then_la1.asm diff --git a/src/main/fragment/mos6502-common/vdum1=_deref_pptc1.asm b/src/main/fragment/mos6502-common/vdum1=_deref_qvoc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vdum1=_deref_pptc1.asm rename to src/main/fragment/mos6502-common/vdum1=_deref_qvoc1.asm diff --git a/src/main/fragment/mos6502-common/vdum1=_dword__deref_pptc1.asm b/src/main/fragment/mos6502-common/vdum1=_dword__deref_qvoc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vdum1=_dword__deref_pptc1.asm rename to src/main/fragment/mos6502-common/vdum1=_dword__deref_qvoc1.asm diff --git a/src/main/fragment/mos6502-common/vwum1=(_deref_pptc1)_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/vwum1=(_deref_qwuc1)_derefidx_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/vwum1=(_deref_pptc1)_derefidx_vbuyy.asm rename to src/main/fragment/mos6502-common/vwum1=(_deref_qwuc1)_derefidx_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/vwum1=_deref_pptz2.asm b/src/main/fragment/mos6502-common/vwum1=_deref_qvoz2.asm similarity index 100% rename from src/main/fragment/mos6502-common/vwum1=_deref_pptz2.asm rename to src/main/fragment/mos6502-common/vwum1=_deref_qvoz2.asm diff --git a/src/main/fragment/mos6502-common/vwum1=pptz2_derefidx_vbuyy.asm b/src/main/fragment/mos6502-common/vwum1=qvoz2_derefidx_vbuyy.asm similarity index 100% rename from src/main/fragment/mos6502-common/vwum1=pptz2_derefidx_vbuyy.asm rename to src/main/fragment/mos6502-common/vwum1=qvoz2_derefidx_vbuyy.asm diff --git a/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_pptc1.asm b/src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm similarity index 100% rename from src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_pptc1.asm rename to src/main/fragment/mos6502-common/vwum1=vwum2_plus__deref_qvoc1.asm diff --git a/src/main/fragment/mos6502-selfmod/_deref_(_deref_pptz1)=vbuaa.asm b/src/main/fragment/mos6502-selfmod/_deref_(_deref_pptz1)=vbuaa.asm deleted file mode 100644 index 6516b7db1..000000000 --- a/src/main/fragment/mos6502-selfmod/_deref_(_deref_pptz1)=vbuaa.asm +++ /dev/null @@ -1,4 +0,0 @@ -ldy {z1} -sty !+ +1 -ldy #0 -!: sta ($ff),y diff --git a/src/main/fragment/mos6502-selfmod/_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm b/src/main/fragment/mos6502-selfmod/_deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-selfmod/_deref_(pptc1_derefidx_vbuyy)=vbuaa.asm rename to src/main/fragment/mos6502-selfmod/_deref_(qbuc1_derefidx_vbuyy)=vbuaa.asm diff --git a/src/main/fragment/mos6502-selfmod/_deref_(pptz1_derefidx_vbuc1)=vbuxx.asm b/src/main/fragment/mos6502-selfmod/_deref_(qbuz1_derefidx_vbuc1)=vbuxx.asm similarity index 100% rename from src/main/fragment/mos6502-selfmod/_deref_(pptz1_derefidx_vbuc1)=vbuxx.asm rename to src/main/fragment/mos6502-selfmod/_deref_(qbuz1_derefidx_vbuc1)=vbuxx.asm diff --git a/src/main/fragment/mos6502-selfmod/_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm b/src/main/fragment/mos6502-selfmod/_deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm similarity index 100% rename from src/main/fragment/mos6502-selfmod/_deref_(pptz1_derefidx_vbuyy)=vbuaa.asm rename to src/main/fragment/mos6502-selfmod/_deref_(qbuz1_derefidx_vbuyy)=vbuaa.asm diff --git a/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuxx.asm b/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuxx.asm deleted file mode 100644 index e7ddcf4ee..000000000 --- a/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuxx.asm +++ /dev/null @@ -1,5 +0,0 @@ -lda {c1} -sta !+ +1 -lda {c1}+1 -sta !+ +2 -!: lda {c1},x diff --git a/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuyy.asm b/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuyy.asm deleted file mode 100644 index 93ddbcdce..000000000 --- a/src/main/fragment/mos6502-selfmod/vbuaa=_lo__deref_pptc1_derefidx_vbuyy.asm +++ /dev/null @@ -1,5 +0,0 @@ -lda {c1} -sta !+ +1 -lda {c1}+1 -sta !+ +2 -!: lda {c1},y