From 5c66505e0479a950beeed1b15b6330cd0a8c748c Mon Sep 17 00:00:00 2001
From: David Schmenk <dschmenk@gmail.com>
Date: Mon, 27 Nov 2017 14:10:15 -0800
Subject: [PATCH] Merge fixes

---
 RPNCALC.PO          | Bin 143360 -> 143360 bytes
 src/vmsrc/plvm802.s |  15 +++++++--------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/RPNCALC.PO b/RPNCALC.PO
index d0c31e53e85705e95c94f8c687b092879778a674..ea591f57d7510192c7279bd386ff5424f1df06c9 100644
GIT binary patch
delta 2183
zcmcIlZ)h837{51Z)0#58C`uR#hjqFYkqkk?P{$mDYso;YU-rrB2pmIXvTs$qxb(WT
zA7<NFaJI70m@X|7a*buQ)fv)1WQDOSx#W_fl0VJaI^1qvwA0ST=e<j>v0dFK`{8}x
z=Xrkb?|GhI-zVqEHF|Q5k$TI%H(W>Bj~_Ys@{8>!+TS{MywXK95Cc}Cv-t^IGf^bq
zaL{IoB2yZTG~OTh;v05t$w#icND_HWmqkyqC;4U4B-%tu+%K*t9pWMJb+Ju+Q+!AC
zC(nqViXKrC6RCMv74bGPERKkmL|5iS=C#bR%#^estw{H!q;yAmKJ#d%C37lsCi806
zmF2RLY*aj(`YiQhs+>BUem8BCTBK{~Y?>{l|4tv4-j+U;h9&z(oGOsaUQP|==}?i&
z2Z-+6boc6r(0$kS8&M5&asctN&j39bLhv%D`l>uSB-wrUyg3F$zij>auMh93zr03H
zt@-DM_CIc$nkO&ZB0!SBV^b1&K`{HGd<-Frm+L;~>+vJgUjxHk&oT+ca<x+Vh!6^t
zT#i#7^#xDN<q`0DQCs5zV4w2Ghd0>&L)KL0D9Cy?`!&dVF?A)?nBJHEIDN^GwMJD|
zV(cf87rAZ|L9?@n2F<Qp1Y_OuwN@&eJVp=}Ibu4Atirk%Bfz^C&|cKhRSMWfh#(>x
zM?S$`FAAE;hE;szWaUY#ukW6AzhxHnnTyEzoa__SuSy+2i3wPonfg8%lD%f8w=J@!
zo7gzuA%taI7XngkKcwwrmC8}QVy3yeo2&b#e_Uw{BI}}XPrJa3D@{RkjqsdW6#lGI
zDdsUm03Qp)jM5N9N<HxEaC40jL^L3J@xqM50%hZKLa^xnTfY1VQQ77>P|+}pH6YqJ
z*IxeI?q*d^rTKDrn;X0V0^YbhpYJn8UMW!LO)*}E_qn7B&xC7?CZBL8^fMijY0pam
zVlxn@pa!Q~=49b2uZCMIc6X60j*nH`E8Ggb%&YxHU#udmCwNv3$0<lY6Cesy6loW|
zXh`=&LDuRKnDsc+0Nl0yC<34EFuLSb0NLI7e=DQTg!w#H2b1bp7UqN3{58(14|kK-
z^X(qo9x+Pb<N`GzYYlCyq6RX-%DV?O)hDp(4`G2qH5jJSgbbSfAmtDPlL9ujw6l>I
zcgz&1{(PLJwzR0W&GhGY_<~47?*s?Y4z!VllOe|dNMNX~WvGo0u=1|K0u@C6c^ik}
zHZzNaJ;v~Wp~8^plQfG?TO2D&f&A5RQ&}UI0eZU5ktBa|{6JpU43=DQERi=HF>F~J
z3(6ch>4+*k`7I;ZjY^FJPA9B}RKsEa07k`Et>T7K!o}p21wD~Oe&?7Wmvrh0B?7tT
zlsFk?>~6TFHO_9%vC7E?X;;a)G2QDdt+tKk!isf~8H_Q5f=~D(RHj2J9V*ewRBN`g
zE7!?zD#Mjma!S*rKu^Z#)s>v^yZ$B8K1-X=Toe958Q9%Zz^j5R@cJH>2)<lc08V!G
zWbk@3^PWs33NTl+_Hg01*oo(#%NM8wuUf;3Z8SG2`1<pcv5r;P1hqRCFlp~ZoAc@3
p(H!nxX$o)k&S+dP(_E3^^3IKp-Jx+RWT4L3>d+Nio$39j{{eiYr#=7x

delta 37
scmZp8z|ru4V*@MO<f8(%n+2HmF)rfx*S<lBar*`#rT|$W$+&?B02Uz)#Q*>R

diff --git a/src/vmsrc/plvm802.s b/src/vmsrc/plvm802.s
index 48142eb..01a731f 100755
--- a/src/vmsrc/plvm802.s
+++ b/src/vmsrc/plvm802.s
@@ -49,15 +49,14 @@ ALTRDON =       $C003
 ALTWROFF=       $C004
 ALTWRON =       $C005
         !SOURCE "vmsrc/plvmzp.inc"
-OP16IDX =       FETCHOP+4
-OP16PAGE=       OP16IDX+1
 DROP16  =       $EE
 NEXTOP16=       $EF
 FETCHOP16=      NEXTOP16+3
 IP16    =       $F3
 IP16L   =       $F3
 IP16H   =       IP16L+1
-OP16TBL =       $F7
+OP16IDX =       FETCHOP16+4
+OP16PAGE=       OP16IDX+1
 HWSP    =       TMPH+1
 ;
 ; BUFFER ADDRESSES
@@ -390,7 +389,7 @@ PAGE0    =      *
 NEXTOPH SEP     #$20            ; SET 8 BIT MODE
         INC     IP16H
         REP     #$20            ; SET 16 BIT MODE
-        BRA     FETCHOP
+        BRA     FETCHOP16
 }
 PAGE3   =       *
 ;*
@@ -661,12 +660,12 @@ ZERO    LDA     #$0000
         PHA
         JMP     NEXTOP16
 CFFB    +INC_IP
-        LDA     (IP),Y
+        LDA     (IP16),Y
         ORA     #$FF00
         PHA
         JMP     NEXTOP16
 CB      +INC_IP
-        LDA     (IP),Y
+        LDA     (IP16),Y
         AND     #$00FF
         PHA
         JMP     NEXTOP16
@@ -676,7 +675,7 @@ CB      +INC_IP
 LA      =       *
 CW      DEX
         +INC_IP
-        LDA     (IP),Y
+        LDA     (IP16),Y
         PHA
         +INC_IP
         JMP     NEXTOP16
@@ -689,7 +688,7 @@ CS      +INC_IP
         ADC     IP16
         STA     IP16
         PHA
-        LDA     (IP),Y
+        LDA     (IP16),Y
         TAY
         JMP     NEXTOP16
 ;