From 8e2a22658910d08ff3af22e77bcf77e7b67af838 Mon Sep 17 00:00:00 2001
From: mgcaret <mgcaret@users.noreply.github.com>
Date: Fri, 5 Jul 2019 11:10:56 -0700
Subject: [PATCH] fix #1 and #2

---
 asm/forth-dictionary.s | 27 ++++++++++-----------------
 1 file changed, 10 insertions(+), 17 deletions(-)

diff --git a/asm/forth-dictionary.s b/asm/forth-dictionary.s
index 5bbfe0b..870c2eb 100644
--- a/asm/forth-dictionary.s
+++ b/asm/forth-dictionary.s
@@ -1374,8 +1374,9 @@ eword
 ; H: ( c-addr -- char ) fetch char from c-addr
 dword     CFETCH,"C@"
           jsr   _popwr
-          ldy   #$00
-          lda   [WR],y
+          sep   #SHORT_A
+          lda   [WR]
+          rep   #SHORT_A
           and   #$00FF
           jsr   _pusha
           NEXT
@@ -1384,23 +1385,17 @@ eword
 ; H: ( c-addr -- word ) fetch word from c-addr
 dword     WFETCH,"W@"
           jsr   _popwr
-          ldy   #$00
-          lda   [WR],y
+          lda   [WR]
           jsr   _pusha
           NEXT
 eword
 
 ; H: ( c-addr -- n ) fetch sign-extended word from c-addr
 dword     WFETCHS,"<W@"
-          jsr   _popwr
-          ldy   #$00
-          lda   [WR],y
-          tay
-          bmi   :+
-          lda   #$0000
-          bra   done
-:         lda   #$FFFF
-done:     NEXT
+          ENTER
+          .dword WFETCH
+          .dword WSX
+          EXIT
 eword
 
 .if unaligned_words
@@ -1445,9 +1440,8 @@ dword     CSTORE,"C!"
           jsr   _popwr
           jsr   _popay
           tya
-          ldy   #$00
           sep   #SHORT_A
-          sta   [WR],y
+          sta   [WR]
           rep   #SHORT_A
           NEXT
 eword
@@ -1457,8 +1451,7 @@ dword     WSTORE,"W!"
           jsr   _popwr
           jsr   _popay
           tya
-          ldy   #$00
-          sta   [WR],y
+          sta   [WR]
           NEXT
 eword