|
 |
a4f04fe |
From 65dd931d22b7196a0b6a4de8d6d441e15acfdab1 Mon Sep 17 00:00:00 2001
|
|
|
a4f04fe |
From: Oliver Schmidt <ol.sc@web.de>
|
|
|
a4f04fe |
Date: Thu, 2 Apr 2020 10:03:01 +0200
|
|
|
a4f04fe |
Subject: [PATCH 167/170] Some style adjustments.
|
|
|
a4f04fe |
|
|
|
a4f04fe |
---
|
|
|
a4f04fe |
libsrc/atari/ostype.s | 4 ++--
|
|
|
a4f04fe |
libsrc/common/atoi.s | 8 +++-----
|
|
|
a4f04fe |
libsrc/common/ctype_preprocessor.s | 10 +++++-----
|
|
|
a4f04fe |
libsrc/common/isalnum.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isalpha.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isblank.s | 4 ++--
|
|
|
a4f04fe |
libsrc/common/iscntrl.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isdigit.s | 4 ++--
|
|
|
a4f04fe |
libsrc/common/isgraph.s | 3 +--
|
|
|
a4f04fe |
libsrc/common/islower.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isprint.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/ispunct.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isspace.s | 4 ++--
|
|
|
a4f04fe |
libsrc/common/isupper.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/isxdigit.s | 2 +-
|
|
|
a4f04fe |
libsrc/common/strlower.s | 9 +++------
|
|
|
a4f04fe |
libsrc/common/strnicmp.s | 20 ++++++++++----------
|
|
|
a4f04fe |
libsrc/common/strupper.s | 7 ++-----
|
|
|
a4f04fe |
libsrc/lynx/crt0.s | 2 +-
|
|
|
a4f04fe |
19 files changed, 41 insertions(+), 50 deletions(-)
|
|
|
a4f04fe |
|
|
|
a4f04fe |
diff --git a/libsrc/atari/ostype.s b/libsrc/atari/ostype.s
|
|
|
a4f04fe |
index 7248582a..876e8749 100644
|
|
|
a4f04fe |
--- a/libsrc/atari/ostype.s
|
|
|
a4f04fe |
+++ b/libsrc/atari/ostype.s
|
|
|
a4f04fe |
@@ -93,7 +93,7 @@ _get_ostype:
|
|
|
a4f04fe |
asl a
|
|
|
a4f04fe |
asl a
|
|
|
a4f04fe |
and #%00111000
|
|
|
a4f04fe |
- ora #%11
|
|
|
a4f04fe |
+ ora #%00000011
|
|
|
a4f04fe |
_fin: ldx #0
|
|
|
a4f04fe |
disable_rom_save_a
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
@@ -117,7 +117,7 @@ _1200_11:
|
|
|
a4f04fe |
lda #%00010000
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_1200_fin:
|
|
|
a4f04fe |
- ora #%010
|
|
|
a4f04fe |
+ ora #%00000010
|
|
|
a4f04fe |
bne _fin
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; 400/800 ROM
|
|
|
a4f04fe |
diff --git a/libsrc/common/atoi.s b/libsrc/common/atoi.s
|
|
|
a4f04fe |
index b63fcb20..10f917f8 100644
|
|
|
a4f04fe |
--- a/libsrc/common/atoi.s
|
|
|
a4f04fe |
+++ b/libsrc/common/atoi.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
;
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_atoi:
|
|
|
a4f04fe |
-_atol: sta ptr1 ; Store s
|
|
|
a4f04fe |
+_atol: sta ptr1 ; store s
|
|
|
a4f04fe |
stx ptr1+1
|
|
|
a4f04fe |
ldy #0
|
|
|
a4f04fe |
sty ptr2
|
|
|
a4f04fe |
@@ -71,7 +71,7 @@ L6: lda (ptr1),y ; get next char
|
|
|
a4f04fe |
lda ptr2+1
|
|
|
a4f04fe |
pha
|
|
|
a4f04fe |
lda ptr2
|
|
|
a4f04fe |
- pha ; Save value
|
|
|
a4f04fe |
+ pha ; save value
|
|
|
a4f04fe |
|
|
|
a4f04fe |
jsr mul2 ; * 4
|
|
|
a4f04fe |
jsr mul2 ; * 8
|
|
|
a4f04fe |
@@ -118,7 +118,7 @@ L8: lda ptr2
|
|
|
a4f04fe |
; Negate the value if necessary, otherwise we're done
|
|
|
a4f04fe |
|
|
|
a4f04fe |
ldy tmp1 ; sign
|
|
|
a4f04fe |
- beq L9 ; Branch if positive
|
|
|
a4f04fe |
+ beq L9 ; branch if positive
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Negate the 32 bit value in ptr2/sreg
|
|
|
a4f04fe |
|
|
|
a4f04fe |
@@ -133,5 +133,3 @@ mul2: asl ptr2
|
|
|
a4f04fe |
rol sreg
|
|
|
a4f04fe |
rol sreg+1 ; * 2
|
|
|
a4f04fe |
L9: rts
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
diff --git a/libsrc/common/ctype_preprocessor.s b/libsrc/common/ctype_preprocessor.s
|
|
|
a4f04fe |
index efa001e6..79d93860 100644
|
|
|
a4f04fe |
--- a/libsrc/common/ctype_preprocessor.s
|
|
|
a4f04fe |
+++ b/libsrc/common/ctype_preprocessor.s
|
|
|
a4f04fe |
@@ -29,7 +29,7 @@ ctype_preprocessor:
|
|
|
a4f04fe |
ctype_preprocessor_no_check:
|
|
|
a4f04fe |
lsr a
|
|
|
a4f04fe |
tax
|
|
|
a4f04fe |
- lda __ctypeIdx, x
|
|
|
a4f04fe |
+ lda __ctypeIdx,x
|
|
|
a4f04fe |
bcc @lowerNibble
|
|
|
a4f04fe |
@upperNibble:
|
|
|
a4f04fe |
lsr a
|
|
|
a4f04fe |
@@ -38,13 +38,13 @@ ctype_preprocessor_no_check:
|
|
|
a4f04fe |
lsr a
|
|
|
a4f04fe |
clc ; remove out of bounds flag
|
|
|
a4f04fe |
@lowerNibble:
|
|
|
a4f04fe |
- and #%1111
|
|
|
a4f04fe |
+ and #%00001111
|
|
|
a4f04fe |
tax
|
|
|
a4f04fe |
- lda __ctype, x
|
|
|
a4f04fe |
- ldx #0
|
|
|
a4f04fe |
+ lda __ctype,x
|
|
|
a4f04fe |
+ ldx #$00
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
|
|
|
a4f04fe |
SC: sec
|
|
|
a4f04fe |
- lda #0
|
|
|
a4f04fe |
+ lda #$00
|
|
|
a4f04fe |
tax
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isalnum.s b/libsrc/common/isalnum.s
|
|
|
a4f04fe |
index 141949c0..2a05e32e 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isalnum.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isalnum.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isalnum:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_ALNUM ; mask character/digit bits
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isalpha.s b/libsrc/common/isalpha.s
|
|
|
a4f04fe |
index 95e79916..7a1f79d2 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isalpha.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isalpha.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isalpha:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_ALPHA ; mask character bits
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isblank.s b/libsrc/common/isblank.s
|
|
|
a4f04fe |
index 3d0a02f3..cc5b9e5a 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isblank.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isblank.s
|
|
|
a4f04fe |
@@ -17,7 +17,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isblank:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_SPACE_TAB ; mask blank bit
|
|
|
a4f04fe |
- @L1: rts
|
|
|
a4f04fe |
+@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/iscntrl.s b/libsrc/common/iscntrl.s
|
|
|
a4f04fe |
index f2b95042..65e2111b 100644
|
|
|
a4f04fe |
--- a/libsrc/common/iscntrl.s
|
|
|
a4f04fe |
+++ b/libsrc/common/iscntrl.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_iscntrl:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_CTRL ; mask control character bit
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isdigit.s b/libsrc/common/isdigit.s
|
|
|
a4f04fe |
index 36acd73b..76b2d1b2 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isdigit.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isdigit.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isdigit:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_DIGIT ; mask digit bit
|
|
|
a4f04fe |
- @L1: rts
|
|
|
a4f04fe |
+@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isgraph.s b/libsrc/common/isgraph.s
|
|
|
a4f04fe |
index 4e317db5..6dd91ed3 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isgraph.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isgraph.s
|
|
|
a4f04fe |
@@ -15,11 +15,10 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isgraph:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_CTRL_SPACE ; mask character bits
|
|
|
a4f04fe |
cmp #1 ; if false, then set "borrow" flag
|
|
|
a4f04fe |
lda #0
|
|
|
a4f04fe |
sbc #0 ; invert logic (return NOT control and NOT space)
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
diff --git a/libsrc/common/islower.s b/libsrc/common/islower.s
|
|
|
a4f04fe |
index 608d0ccf..a11ee129 100644
|
|
|
a4f04fe |
--- a/libsrc/common/islower.s
|
|
|
a4f04fe |
+++ b/libsrc/common/islower.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_islower:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_LOWER ; mask lower char bit
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isprint.s b/libsrc/common/isprint.s
|
|
|
a4f04fe |
index 0d135f24..e1d63bc6 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isprint.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isprint.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isprint:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
eor #CT_CTRL ; NOT a control char
|
|
|
a4f04fe |
and #CT_CTRL ; mask control char bit
|
|
|
a4f04fe |
diff --git a/libsrc/common/ispunct.s b/libsrc/common/ispunct.s
|
|
|
a4f04fe |
index a532399f..ac4ab7f1 100644
|
|
|
a4f04fe |
--- a/libsrc/common/ispunct.s
|
|
|
a4f04fe |
+++ b/libsrc/common/ispunct.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_ispunct:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_NOT_PUNCT ; mask relevant bits
|
|
|
a4f04fe |
cmp #1 ; if false, then set "borrow" flag
|
|
|
a4f04fe |
diff --git a/libsrc/common/isspace.s b/libsrc/common/isspace.s
|
|
|
a4f04fe |
index 1f70786c..c3702344 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isspace.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isspace.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isspace:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #(CT_SPACE | CT_OTHER_WS) ; mask space bits
|
|
|
a4f04fe |
- @L1: rts
|
|
|
a4f04fe |
+@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isupper.s b/libsrc/common/isupper.s
|
|
|
a4f04fe |
index 0dd2a6ea..175fb872 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isupper.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isupper.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isupper:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_UPPER ; mask upper char bit
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/isxdigit.s b/libsrc/common/isxdigit.s
|
|
|
a4f04fe |
index 3f36ede0..e8a12a10 100644
|
|
|
a4f04fe |
--- a/libsrc/common/isxdigit.s
|
|
|
a4f04fe |
+++ b/libsrc/common/isxdigit.s
|
|
|
a4f04fe |
@@ -15,7 +15,7 @@
|
|
|
a4f04fe |
.import ctype_preprocessor
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_isxdigit:
|
|
|
a4f04fe |
- jsr ctype_preprocessor ; (clears always x)
|
|
|
a4f04fe |
+ jsr ctype_preprocessor ; (always clears X)
|
|
|
a4f04fe |
bcs @L1 ; out of range? (everything already clear -> false)
|
|
|
a4f04fe |
and #CT_XDIGIT ; mask xdigit bit
|
|
|
a4f04fe |
@L1: rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/strlower.s b/libsrc/common/strlower.s
|
|
|
a4f04fe |
index d4e48138..479d852e 100644
|
|
|
a4f04fe |
--- a/libsrc/common/strlower.s
|
|
|
a4f04fe |
+++ b/libsrc/common/strlower.s
|
|
|
a4f04fe |
@@ -16,7 +16,7 @@
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_strlower:
|
|
|
a4f04fe |
_strlwr:
|
|
|
a4f04fe |
- sta ptr1 ; Save s (working copy)
|
|
|
a4f04fe |
+ sta ptr1 ; save s (working copy)
|
|
|
a4f04fe |
stx ptr1+1
|
|
|
a4f04fe |
sta ptr2
|
|
|
a4f04fe |
stx ptr2+1 ; save function result
|
|
|
a4f04fe |
@@ -25,10 +25,10 @@ _strlwr:
|
|
|
a4f04fe |
loop: lda (ptr1),y ; get character
|
|
|
a4f04fe |
beq L9 ; jump if done
|
|
|
a4f04fe |
; get character classification
|
|
|
a4f04fe |
- jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
+ jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
and #CT_UPPER ; upper case char?
|
|
|
a4f04fe |
beq L1 ; jump if no
|
|
|
a4f04fe |
- lda (ptr1),y ; fetch character again
|
|
|
a4f04fe |
+ lda (ptr1),y ; fetch character again
|
|
|
a4f04fe |
adc #<('a'-'A') ; make lower case char (ctype_preprocessor_no_check ensures carry clear)
|
|
|
a4f04fe |
sta (ptr1),y ; store back
|
|
|
a4f04fe |
L1: iny ; next char
|
|
|
a4f04fe |
@@ -41,6 +41,3 @@ L1: iny ; next char
|
|
|
a4f04fe |
L9: lda ptr2
|
|
|
a4f04fe |
ldx ptr2+1
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
diff --git a/libsrc/common/strnicmp.s b/libsrc/common/strnicmp.s
|
|
|
a4f04fe |
index 54aef2bb..c4cc272d 100644
|
|
|
a4f04fe |
--- a/libsrc/common/strnicmp.s
|
|
|
a4f04fe |
+++ b/libsrc/common/strnicmp.s
|
|
|
a4f04fe |
@@ -41,7 +41,7 @@ _strncasecmp:
|
|
|
a4f04fe |
; Start of compare loop. Check the counter.
|
|
|
a4f04fe |
|
|
|
a4f04fe |
Loop: inc ptr3
|
|
|
a4f04fe |
- beq IncHi ; Increment high byte
|
|
|
a4f04fe |
+ beq IncHi ; increment high byte
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Compare a byte from the strings
|
|
|
a4f04fe |
|
|
|
a4f04fe |
@@ -58,18 +58,18 @@ Comp: lda (ptr2),y
|
|
|
a4f04fe |
L1: lda (ptr1),y ; get character from first string
|
|
|
a4f04fe |
sta tmp1 ; remember original char
|
|
|
a4f04fe |
; get character classification
|
|
|
a4f04fe |
- jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
+ jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
and #CT_LOWER ; lower case char?
|
|
|
a4f04fe |
beq L2 ; jump if no
|
|
|
a4f04fe |
lda #<('A'-'a') ; make upper case char
|
|
|
a4f04fe |
adc tmp1 ; ctype_preprocessor_no_check ensures carry clear!
|
|
|
a4f04fe |
- sta tmp1 ; remember upper case equivalent
|
|
|
a4f04fe |
+ sta tmp1 ; remember upper case equivalent
|
|
|
a4f04fe |
|
|
|
a4f04fe |
L2: ldx tmp1
|
|
|
a4f04fe |
cpx tmp2 ; compare characters
|
|
|
a4f04fe |
- bne NotEqual ; Jump if strings different
|
|
|
a4f04fe |
- txa ; End of strings?
|
|
|
a4f04fe |
- beq Equal1 ; Jump if EOS reached, a/x == 0
|
|
|
a4f04fe |
+ bne NotEqual ; jump if strings different
|
|
|
a4f04fe |
+ txa ; end of strings?
|
|
|
a4f04fe |
+ beq Equal1 ; jump if EOS reached, a/x == 0
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Increment the pointers
|
|
|
a4f04fe |
|
|
|
a4f04fe |
@@ -77,12 +77,12 @@ L2: ldx tmp1
|
|
|
a4f04fe |
bne Loop
|
|
|
a4f04fe |
inc ptr1+1
|
|
|
a4f04fe |
inc ptr2+1
|
|
|
a4f04fe |
- bne Loop ; Branch always
|
|
|
a4f04fe |
+ bne Loop ; branch always
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Increment hi byte
|
|
|
a4f04fe |
|
|
|
a4f04fe |
IncHi: inc ptr3+1
|
|
|
a4f04fe |
- bne Comp ; Jump if counter not zero
|
|
|
a4f04fe |
+ bne Comp ; jump if counter not zero
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Exit code if strings are equal. a/x not set
|
|
|
a4f04fe |
|
|
|
a4f04fe |
@@ -94,8 +94,8 @@ Equal1: rts
|
|
|
a4f04fe |
|
|
|
a4f04fe |
NotEqual:
|
|
|
a4f04fe |
bcs L3
|
|
|
a4f04fe |
- ldx #$FF ; Make result negative
|
|
|
a4f04fe |
+ ldx #$FF ; make result negative
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
|
|
|
a4f04fe |
-L3: ldx #$01 ; Make result positive
|
|
|
a4f04fe |
+L3: ldx #$01 ; make result positive
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
diff --git a/libsrc/common/strupper.s b/libsrc/common/strupper.s
|
|
|
a4f04fe |
index dd6c1c25..e2160d4d 100644
|
|
|
a4f04fe |
--- a/libsrc/common/strupper.s
|
|
|
a4f04fe |
+++ b/libsrc/common/strupper.s
|
|
|
a4f04fe |
@@ -16,7 +16,7 @@
|
|
|
a4f04fe |
|
|
|
a4f04fe |
_strupper:
|
|
|
a4f04fe |
_strupr:
|
|
|
a4f04fe |
- sta ptr1 ; Save s (working copy)
|
|
|
a4f04fe |
+ sta ptr1 ; save s (working copy)
|
|
|
a4f04fe |
stx ptr1+1
|
|
|
a4f04fe |
sta ptr2
|
|
|
a4f04fe |
stx ptr2+1 ; save function result
|
|
|
a4f04fe |
@@ -24,7 +24,7 @@ _strupr:
|
|
|
a4f04fe |
|
|
|
a4f04fe |
loop: lda (ptr1),y ; get character
|
|
|
a4f04fe |
beq L9 ; jump if done
|
|
|
a4f04fe |
- jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
+ jsr ctype_preprocessor_no_check
|
|
|
a4f04fe |
and #CT_LOWER ; lower case char?
|
|
|
a4f04fe |
beq L1 ; jump if no
|
|
|
a4f04fe |
lda (ptr1),y ; fetch character again
|
|
|
a4f04fe |
@@ -40,6 +40,3 @@ L1: iny ; next char
|
|
|
a4f04fe |
L9: lda ptr2
|
|
|
a4f04fe |
ldx ptr2+1
|
|
|
a4f04fe |
rts
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
-
|
|
|
a4f04fe |
diff --git a/libsrc/lynx/crt0.s b/libsrc/lynx/crt0.s
|
|
|
a4f04fe |
index da2162b4..238a2c99 100644
|
|
|
a4f04fe |
--- a/libsrc/lynx/crt0.s
|
|
|
a4f04fe |
+++ b/libsrc/lynx/crt0.s
|
|
|
a4f04fe |
@@ -68,7 +68,7 @@ MikeyInitData: .byte $9e,$18,$68,$1f,$00,$00,$00,$00,$00,$ff,$1a,$1b,$04,$0d,$2
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Disable the TX/RX IRQ; set to 8E1.
|
|
|
a4f04fe |
|
|
|
a4f04fe |
- lda #%11101
|
|
|
a4f04fe |
+ lda #%00011101
|
|
|
a4f04fe |
sta SERCTL
|
|
|
a4f04fe |
|
|
|
a4f04fe |
; Clear all pending interrupts.
|
|
|
a4f04fe |
--
|
|
|
a4f04fe |
2.26.0
|
|
|
a4f04fe |
|