diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000..1a6397284
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+guidelines = 80, 120
+
+[*.{c,h}]
+cpp_new_line_before_open_brace_block=same_line
+cpp_new_line_before_open_brace_function=new_line
+cpp_space_before_function_open_parenthesis=insert
+cpp_new_line_before_else=false
diff --git a/Contributing.md b/Contributing.md
index 3b355373c..25c6217aa 100644
--- a/Contributing.md
+++ b/Contributing.md
@@ -139,7 +139,7 @@ You can refer to Annex B of the ISO C99 standard ([here](https://www.open-std.or
* If a function is declared to return a char-sized value, it actually must return an integer-sized value. (When cc65 promotes a returned value, it sometimes assumes that the value already is an integer.) This must be done in one of the following ways:
lda #RETURN_VALUE
- ldx #0 ; return value is char
+ ldx #0 ; Promote char return value
or, if the value is 0, you can use:
diff --git a/README.md b/README.md
index e0e2c24e7..3e04158e1 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,10 @@ For details look at the [Website](https://cc65.github.io).
## People
+Project founder:
+
+* Ullrich von Bassewitz
+
Core team members:
* [Christian Groessler](https://github.com/groessler): Atari, Atari5200, and CreatiVision library Maintainer
diff --git a/cfg/apple2-hgr.cfg b/cfg/apple2-hgr.cfg
index cfe577e00..109fbe4f6 100644
--- a/cfg/apple2-hgr.cfg
+++ b/cfg/apple2-hgr.cfg
@@ -27,7 +27,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro start = $4000;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2-overlay.cfg b/cfg/apple2-overlay.cfg
index a0b7678c1..754ece90f 100644
--- a/cfg/apple2-overlay.cfg
+++ b/cfg/apple2-overlay.cfg
@@ -43,7 +43,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2-system.cfg b/cfg/apple2-system.cfg
index 0170feb93..3dd94d793 100644
--- a/cfg/apple2-system.cfg
+++ b/cfg/apple2-system.cfg
@@ -22,7 +22,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2.cfg b/cfg/apple2.cfg
index a6809cf89..19932b1f9 100644
--- a/cfg/apple2.cfg
+++ b/cfg/apple2.cfg
@@ -26,7 +26,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2enh-hgr.cfg b/cfg/apple2enh-hgr.cfg
index cfe577e00..109fbe4f6 100644
--- a/cfg/apple2enh-hgr.cfg
+++ b/cfg/apple2enh-hgr.cfg
@@ -27,7 +27,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro start = $4000;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2enh-overlay.cfg b/cfg/apple2enh-overlay.cfg
index a0b7678c1..754ece90f 100644
--- a/cfg/apple2enh-overlay.cfg
+++ b/cfg/apple2enh-overlay.cfg
@@ -43,7 +43,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2enh-system.cfg b/cfg/apple2enh-system.cfg
index 0170feb93..3dd94d793 100644
--- a/cfg/apple2enh-system.cfg
+++ b/cfg/apple2enh-system.cfg
@@ -22,7 +22,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/apple2enh.cfg b/cfg/apple2enh.cfg
index a6809cf89..19932b1f9 100644
--- a/cfg/apple2enh.cfg
+++ b/cfg/apple2enh.cfg
@@ -26,7 +26,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
LC: load = MAIN, run = LC, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/atari-overlay.cfg b/cfg/atari-overlay.cfg
index 9311a1b22..60f98e453 100644
--- a/cfg/atari-overlay.cfg
+++ b/cfg/atari-overlay.cfg
@@ -52,7 +52,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
AUTOSTRT: load = TRAILER, type = ro;
OVERLAY1: load = OVL1, type = ro, define = yes, optional = yes;
diff --git a/cfg/atari-xex.cfg b/cfg/atari-xex.cfg
index cabde3708..deab5c7a5 100644
--- a/cfg/atari-xex.cfg
+++ b/cfg/atari-xex.cfg
@@ -36,7 +36,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
}
FEATURES {
diff --git a/cfg/atari.cfg b/cfg/atari.cfg
index 106c75e63..37337ea53 100644
--- a/cfg/atari.cfg
+++ b/cfg/atari.cfg
@@ -40,7 +40,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
AUTOSTRT: load = TRAILER, type = ro;
}
diff --git a/cfg/atarixl-largehimem.cfg b/cfg/atarixl-largehimem.cfg
index 38fb68db9..8f70597aa 100644
--- a/cfg/atarixl-largehimem.cfg
+++ b/cfg/atarixl-largehimem.cfg
@@ -67,7 +67,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
AUTOSTRT: load = TRAILER, type = ro;
}
diff --git a/cfg/atarixl-overlay.cfg b/cfg/atarixl-overlay.cfg
index 339228ea0..3b8da4256 100644
--- a/cfg/atarixl-overlay.cfg
+++ b/cfg/atarixl-overlay.cfg
@@ -78,7 +78,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
AUTOSTRT: load = TRAILER, type = ro;
diff --git a/cfg/atarixl-xex.cfg b/cfg/atarixl-xex.cfg
index 1b76855d0..853096c6f 100644
--- a/cfg/atarixl-xex.cfg
+++ b/cfg/atarixl-xex.cfg
@@ -58,7 +58,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
SRPREPHDR: load = UNUSED, type = ro;
SRPREPTRL: load = UNUSED, type = ro;
diff --git a/cfg/atarixl.cfg b/cfg/atarixl.cfg
index cece23555..1517afb5a 100644
--- a/cfg/atarixl.cfg
+++ b/cfg/atarixl.cfg
@@ -65,7 +65,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro, define = yes;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = bss, optional = yes;
BSS: load = MAIN, type = bss, define = yes;
AUTOSTRT: load = TRAILER, type = ro;
}
diff --git a/cfg/atmos.cfg b/cfg/atmos.cfg
index 35f184f4f..4c370903a 100644
--- a/cfg/atmos.cfg
+++ b/cfg/atmos.cfg
@@ -23,7 +23,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BASTAIL: load = MAIN, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/cfg/c64-overlay.cfg b/cfg/c64-overlay.cfg
index 0f42434ad..ae760b30c 100644
--- a/cfg/c64-overlay.cfg
+++ b/cfg/c64-overlay.cfg
@@ -44,7 +44,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BSS: load = BSS, type = bss, define = yes;
OVL1ADDR: load = OVL1ADDR, type = ro;
diff --git a/cfg/c64.cfg b/cfg/c64.cfg
index 5bd8d8240..59cadd46b 100644
--- a/cfg/c64.cfg
+++ b/cfg/c64.cfg
@@ -23,7 +23,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BSS: load = BSS, type = bss, define = yes;
}
diff --git a/cfg/creativision.cfg b/cfg/creativision.cfg
index 2eb9ac427..f3b7ac0f4 100644
--- a/cfg/creativision.cfg
+++ b/cfg/creativision.cfg
@@ -11,10 +11,10 @@ SEGMENTS {
ZP: load = ZP, type = zp, optional = yes;
VECTORS: load = ROM, run = RAM, type = rw, define = yes;
DATA: load = ROM, run = RAM, type = rw, define = yes, start = $0204;
+ INIT: load = RAM, type = bss, optional = yes;
BSS: load = RAM, type = bss, define = yes;
ONCE: load = ROM, type = ro, optional = yes;
CODE: load = ROM, type = ro;
- INIT: load = ROM, type = ro;
RODATA: load = ROM, type = ro;
AUDIO: load = ROM, type = ro, optional = yes, start = $BF00;
SETUP: load = ROM, type = ro, start = $BFE8;
diff --git a/cfg/cx16-bank.cfg b/cfg/cx16-bank.cfg
index d3c2c02ae..264b6fcba 100644
--- a/cfg/cx16-bank.cfg
+++ b/cfg/cx16-bank.cfg
@@ -57,7 +57,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = rw, optional = yes; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BSS: load = BSS, type = bss, define = yes;
BRAM01ADDR: load = BRAM01ADDR, type = ro, optional = yes;
diff --git a/cfg/cx16.cfg b/cfg/cx16.cfg
index 4b6025fb6..a160a6718 100644
--- a/cfg/cx16.cfg
+++ b/cfg/cx16.cfg
@@ -24,7 +24,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw, optional = yes;
+ INIT: load = MAIN, type = rw, optional = yes; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BSS: load = BSS, type = bss, define = yes;
}
diff --git a/cfg/telestrat.cfg b/cfg/telestrat.cfg
index bd720fb8d..52b982eef 100644
--- a/cfg/telestrat.cfg
+++ b/cfg/telestrat.cfg
@@ -22,7 +22,7 @@ SEGMENTS {
CODE: load = MAIN, type = ro;
RODATA: load = MAIN, type = ro;
DATA: load = MAIN, type = rw;
- INIT: load = MAIN, type = rw;
+ INIT: load = MAIN, type = rw; # uninitialized, but reserves output space
ONCE: load = MAIN, type = ro, define = yes;
BASTAIL: load = MAIN, type = ro, optional = yes;
BSS: load = BSS, type = bss, define = yes;
diff --git a/doc/apple2.sgml b/doc/apple2.sgml
index 63b40c6f8..063cfc71f 100644
--- a/doc/apple2.sgml
+++ b/doc/apple2.sgml
@@ -427,8 +427,12 @@ The names in the parentheses denote the symbols to be used for static linking of
- Driver for the Apple II Super Serial Card. Supports up to 19200 baud,
- requires hardware flow control (RTS/CTS) and does interrupt driven receives.
+ Driver for the Apple II Super Serial Card.
+ The SSC is an extension card for the II, II+, IIe; the Apple //c and //c+ have
+ the same hardware and firmware integrated.
+ It supports up to 9600 baud, requires hardware flow control (RTS/CTS) and
+ does interrupt driven receives. Speeds faster than 9600 baud aren't reachable
+ because the ROM and ProDOS IRQ handlers are too slow.
Note that because of the peculiarities of the 6551 chip transmits are not
interrupt driven, and the transceiver blocks if the receiver asserts
flow control because of a full buffer.
@@ -438,6 +442,25 @@ The names in the parentheses denote the symbols to be used for static linking of
succeeds for all Apple II slots, but
+ Driver for the Apple IIgs serial ports (printer and modem).
+ It supports up to 9600 baud, requires hardware flow control (RTS/CTS) and
+ does interrupt driven receives. Speeds faster than 9600 baud aren't reachable
+ because the ROM and ProDOS IRQ handlers are too slow.
+ Note that transmits are not interrupt driven, and the transceiver blocks if
+ the receiver asserts flow control because of a full buffer.
+
+ The driver defaults to opening the modem port. Calling
@@ -603,7 +626,7 @@ url="ca65.html" name="assembler manual">.
The header file Example
. Even functions marked as "platform dependent" may
be available on more than one platform. Please see the function reference for
@@ -427,8 +428,12 @@ The names in the parentheses denote the symbols to be used for static linking of
- Driver for the Apple II Super Serial Card. Supports up to 19200 baud,
- requires hardware flow control (RTS/CTS) and does interrupt driven receives.
+ Driver for the Apple II Super Serial Card.
+ The SSC is an extension card for the II, II+, IIe; the Apple //c and //c+ have
+ the same hardware and firmware integrated.
+ It supports up to 9600 baud, requires hardware flow control (RTS/CTS) and
+ does interrupt driven receives. Speeds faster than 9600 baud aren't reachable
+ because the ROM and ProDOS IRQ handlers are too slow.
Note that because of the peculiarities of the 6551 chip transmits are not
interrupt driven, and the transceiver blocks if the receiver asserts
flow control because of a full buffer.
@@ -438,6 +443,25 @@ The names in the parentheses denote the symbols to be used for static linking of
succeeds for all Apple II slots, but
+ Driver for the Apple IIgs serial ports (printer and modem).
+ It supports up to 9600 baud, requires hardware flow control (RTS/CTS) and
+ does interrupt driven receives. Speeds faster than 9600 baud aren't reachable
+ because the ROM and ProDOS IRQ handlers are too slow.
+ Note that transmits are not interrupt driven, and the transceiver blocks if
+ the receiver asserts flow control because of a full buffer.
+
+ The driver defaults to opening the modem port. Calling
diff --git a/doc/ca65.sgml b/doc/ca65.sgml
index 982c68949..b0ccf6f5e 100644
--- a/doc/ca65.sgml
+++ b/doc/ca65.sgml
@@ -120,7 +120,7 @@ Long options:
--list-bytes n Maximum number of bytes per listing line
--memory-model model Set the memory model
--pagelength n Set the page length for the listing
- --relax-checks Relax some checks (see docs)
+ --relax-checks Disables some error checks
--smart Enable smart mode
--target sys Set the target system
--verbose Increase verbosity
@@ -265,14 +265,17 @@ Here is a description of all the command line options:
--relax-checks
-- Short branches between two different segments.
-
- Byte sized address loads where the address is not a zeropage address.
+
- Address vs. fragment size: a byte sized load from an non-zeropage
+ address is truncated instead of producing an error.
+
- Indirect jump on page boundary:
jmp (label) on a label that
+ resides on a page boundary ($xxFF ) fetches the second byte from the
+ wrong address on 6502 CPUs, now allowed instead of producing an error.
diff --git a/doc/cc65.sgml b/doc/cc65.sgml
index e1e9214e5..6d036c149 100644
--- a/doc/cc65.sgml
+++ b/doc/cc65.sgml
@@ -837,7 +837,7 @@ This cc65 version has some extensions to the ISO C standard.
-- The compiler allows to insert assembler statements into the output
+
- The compiler allows to insert assembler expressions into the output
file. The syntax is
@@ -851,7 +851,7 @@ This cc65 version has some extensions to the ISO C standard.
The first form is in the user namespace; and, is disabled if the .
@@ -1714,7 +1714,7 @@ bloated code and a slowdown.
Inline assembler
-The compiler allows to insert assembler statements into the output file. The
+The compiler allows to insert assembler expressions into the output file. The
syntax is
@@ -1729,7 +1729,7 @@ or
The first form is in the user namespace; and, is disabled by
Note: Do not embed the assembler labels that are used as names of global
-variables or functions into your
int foo;
diff --git a/doc/funcref.sgml b/doc/funcref.sgml
index 2a6d77adc..524818b19 100644
--- a/doc/funcref.sgml
+++ b/doc/funcref.sgml
@@ -334,9 +334,11 @@ function.
-
+[
+
+
][
@@ -440,6 +442,16 @@ see also ]testcode/lib/em-test.c and samples/multidemo.c .
.
+
+
+
+[
+][
+][
+][
+]
+
+
@@ -452,6 +464,18 @@ see also testcode/lib/em-test.c and samples/multidemo.c .
+
+
+
+
+
+[
+][
+]
+
+(incomplete)
+
+
@@ -1735,7 +1759,7 @@ used in presence of a prototype.
,
[,
-][,
+][
]
@@ -1880,7 +1904,7 @@ be used in presence of a prototype.
[,
][,
][,
-][,
+][
]
@@ -1953,7 +1977,7 @@ sent a command to TALK and a secondary address if it needs one.
,
+[
]
@@ -2355,8 +2379,8 @@ function, in order to provide input from the keyboard.
,
[,
-][,
-
+][
+
]
@@ -3274,7 +3298,7 @@ used in presence of a prototype.
,
-[,
+][
]
@@ -3314,7 +3338,7 @@ used in presence of a prototype.
,
-[,
+][
]
@@ -3440,11 +3464,11 @@ int main(void)
/
+/, /
-- The function is specific to the Sym-1.
+
- The function is specific to the Sym-1 and KIM-1.
- The return value is status. Non-zero status indicates an error.
- The function is only available as fastcall function, so it may only
be used in presence of a prototype.
@@ -3453,7 +3477,7 @@ be used in presence of a prototype.
,
[,
-][,
+][
]
@@ -3833,7 +3857,7 @@ switching the CPU into double clock mode.
,
[,
-][,
+][
]
@@ -3949,7 +3973,8 @@ be used in presence of a prototype.
,
-[, ][/
+][, ][,
+][/
]
+htonl
+
+
+
+/
+
+- The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+
+
+
+
+
+
+htons
+
+
+
+/
+
+- The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+
+
+
+
+
isalnum
@@ -5084,11 +5148,11 @@ used in presence of a prototype.
/
+/, /
-- The function is specific to the Sym-1.
+
- The function is specific to the Sym-1 and KIM-1.
- The return value is status. Non-zero status indicates an error.
- The function is only available as fastcall function, so it may only
be used in presence of a prototype.
@@ -5097,7 +5161,7 @@ be used in presence of a prototype.
,
[,
-][,
+][
]
@@ -5757,6 +5821,44 @@ memory allocated for the driver.
+ntohl
+
+
+
+/
+
+- The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+
+
+
+
+
+ntohs
+
+
+
+/
+
+- The function is only available as fastcall function, so it may only
+be used in presence of a prototype.
+
+
+
+
+
offsetof
@@ -6606,7 +6708,8 @@ be used in presence of a prototype.
/
Large GEOS applications typically don't fit in one piece in their designated
memory area. They are therefore split into overlays which are loaded into memory
on demand. The individual overlays are stored as records of a VLIR (Variable
-Length Index Record) file. When GEOS starts a VLIR overlay appliation it loads
+Length Index Record) file. When GEOS starts a VLIR overlay application it loads
record number 0 which is supposed to contain the main program. The record numbers
starting with 1 are to be used for the actual overlays.
diff --git a/include/apple2.h b/include/apple2.h
index 9f644bc97..8b9a3e0ea 100644
--- a/include/apple2.h
+++ b/include/apple2.h
@@ -172,6 +172,7 @@ extern void a2_auxmem_emd[];
extern void a2_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void a2_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */
extern void a2_ssc_ser[]; /* Referred to by ser_static_stddrv[] */
+extern void a2_gs_ser[]; /* IIgs serial driver */
extern void a2_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */
extern void a2_lo_tgi[];
#endif
diff --git a/include/apple2enh.h b/include/apple2enh.h
index bfe5cdb18..3989d0b8d 100644
--- a/include/apple2enh.h
+++ b/include/apple2enh.h
@@ -100,6 +100,7 @@ extern void a2e_auxmem_emd[];
extern void a2e_stdjoy_joy[]; /* Referred to by joy_static_stddrv[] */
extern void a2e_stdmou_mou[]; /* Referred to by mouse_static_stddrv[] */
extern void a2e_ssc_ser[]; /* Referred to by ser_static_stddrv[] */
+extern void a2e_gs_ser[]; /* IIgs serial driver */
extern void a2e_hi_tgi[]; /* Referred to by tgi_static_stddrv[] */
extern void a2e_lo_tgi[];
diff --git a/include/arpa/inet.h b/include/arpa/inet.h
new file mode 100644
index 000000000..cd353a2bb
--- /dev/null
+++ b/include/arpa/inet.h
@@ -0,0 +1,67 @@
+/*****************************************************************************/
+/* */
+/* arpa/inet.h */
+/* */
+/* Endianness utilities for cc65 */
+/* */
+/* */
+/* */
+/* (C) 2023 Colin Leroy-Mira, */
+/* */
+/* */
+/* This software is provided 'as-is', without any expressed or implied */
+/* warranty. In no event will the authors be held liable for any damages */
+/* arising from the use of this software. */
+/* */
+/* Permission is granted to anyone to use this software for any purpose, */
+/* including commercial applications, and to alter it and redistribute it */
+/* freely, subject to the following restrictions: */
+/* */
+/* 1. The origin of this software must not be misrepresented; you must not */
+/* claim that you wrote the original software. If you use this software */
+/* in a product, an acknowledgment in the product documentation would be */
+/* appreciated but is not required. */
+/* 2. Altered source versions must be plainly marked as such, and must not */
+/* be misrepresented as being the original software. */
+/* 3. This notice may not be removed or altered from any source */
+/* distribution. */
+/* */
+/*****************************************************************************/
+
+
+
+#ifndef _ARPA_INET_H
+#define _ARPA_INET_H
+
+
+
+/*****************************************************************************/
+/* Code */
+/*****************************************************************************/
+
+
+
+#if (__OPT_i__ < 200)
+int __fastcall__ ntohs (int val);
+int __fastcall__ htons (int val);
+#else
+
+#define ntohs(x) \
+ ( \
+ __AX__=(x), \
+ asm("sta tmp1"), \
+ asm("txa"), \
+ asm("ldx tmp1"), \
+ __AX__ \
+ )
+#define htons(x) ntohs(x)
+
+#endif
+
+long __fastcall__ ntohl (long val);
+long __fastcall__ htonl (long val);
+
+
+
+/* End of arpa/inet.h */
+#endif
diff --git a/include/cx16.h b/include/cx16.h
index 66f21843e..5bbd21247 100644
--- a/include/cx16.h
+++ b/include/cx16.h
@@ -256,6 +256,42 @@ struct __vera {
unsigned char vstart; /* Vertical start position */
unsigned char vstop; /* Vertical stop position */
};
+ struct { /* Visible when DCSEL flag = 2 */
+ unsigned char fxctrl;
+ unsigned char fxtilebase;
+ unsigned char fxmapbase;
+ unsigned char fxmult;
+ };
+ struct { /* Visible when DCSEL flag = 3 */
+ unsigned char fxxincrl;
+ unsigned char fxxincrh;
+ unsigned char fxyincrl;
+ unsigned char fxyincrh;
+ };
+ struct { /* Visible when DCSEL flag = 4 */
+ unsigned char fxxposl;
+ unsigned char fxxposh;
+ unsigned char fxyposl;
+ unsigned char fxyposh;
+ };
+ struct { /* Visible when DCSEL flag = 5 */
+ unsigned char fxxposs;
+ unsigned char fxyposs;
+ unsigned char fxpolyfilll;
+ unsigned char fxpolyfillh;
+ };
+ struct { /* Visible when DCSEL flag = 6 */
+ unsigned char fxcachel;
+ unsigned char fxcachem;
+ unsigned char fxcacheh;
+ unsigned char fxcacheu;
+ };
+ struct { /* Visible when DCSEL flag = 63 */
+ unsigned char dcver0;
+ unsigned char dcver1;
+ unsigned char dcver2;
+ unsigned char dcver3;
+ };
} display;
struct {
unsigned char config; /* Layer map geometry */
diff --git a/libsrc/Makefile b/libsrc/Makefile
index d8671d2da..78e362573 100644
--- a/libsrc/Makefile
+++ b/libsrc/Makefile
@@ -131,8 +131,8 @@ $(TARGETS): | ../lib
else # TARGET
-CA65FLAGS =
-CC65FLAGS = -Or -W error
+CA65FLAGS = -g
+CC65FLAGS = -g -Or -W error
EXTZP = cbm510 \
cbm610 \
diff --git a/libsrc/apple2/cputc.s b/libsrc/apple2/cputc.s
index 30383fcfe..035b1c047 100644
--- a/libsrc/apple2/cputc.s
+++ b/libsrc/apple2/cputc.s
@@ -14,6 +14,8 @@
.include "apple2.inc"
+ .macpack cpu
+
.segment "ONCE"
.ifdef __APPLE2ENH__
@@ -51,8 +53,13 @@ cputdirect:
cmp WNDWDTH
bcc :+
jsr newline
-left: lda #$00 ; Goto left edge of screen
+left:
+ .if (.cpu .bitand CPU_ISET_65SC02)
+ stz CH ; Goto left edge of screen
+ .else
+ lda #$00 ; Goto left edge of screen
sta CH
+ .endif
: rts
newline:
@@ -78,17 +85,18 @@ mask: and INVFLG ; Apply normal, inverse, flash
putchardirect:
pha
- ldy CH
.ifdef __APPLE2ENH__
+ lda CH
bit RD80VID ; In 80 column mode?
bpl put ; No, just go ahead
- tya
lsr ; Div by 2
- tay
bcs put ; Odd cols go in main memory
bit HISCR ; Assume SET80COL
+put: tay
+ .else
+ ldy CH
.endif
-put: lda (BASL),Y ; Get current character
+ lda (BASL),Y ; Get current character
tax ; Return old character for _cgetc
pla
sta (BASL),Y
diff --git a/libsrc/apple2/exec.s b/libsrc/apple2/exec.s
index d5cbf8788..27a6487bd 100644
--- a/libsrc/apple2/exec.s
+++ b/libsrc/apple2/exec.s
@@ -213,8 +213,6 @@ source: jsr $BF00
bcs error
; Check for cmdline handling
- lda $0100 ; Valid cmdline?
- beq jump ; No, jump to program right away
ldx file_type ; SYS file?
bne system ; Yes, check for startup filename
diff --git a/libsrc/apple2/ser/a2.gs.s b/libsrc/apple2/ser/a2.gs.s
new file mode 100644
index 000000000..7f6bc824d
--- /dev/null
+++ b/libsrc/apple2/ser/a2.gs.s
@@ -0,0 +1,713 @@
+;
+; Serial driver for the Apple IIgs Zilog Z8530.
+;
+; Colin Leroy-Mira , 2023
+;
+; This software is licensed under the same license as cc65,
+; the zlib license (see LICENSE file).
+;
+; Documentation from http://www.applelogic.org/files/Z8530UM.pdf (pages
+; referred to where applicable)
+; and https://gswv.apple2.org.za/a2zine/Utils/Z8530_SCCsamples_info.txt
+
+
+
+ .setcpu "65816"
+
+ .include "zeropage.inc"
+ .include "ser-kernel.inc"
+ .include "ser-error.inc"
+
+ .macpack module
+
+; ------------------------------------------------------------------------
+; Header. Includes jump table
+
+ .ifdef __APPLE2ENH__
+ module_header _a2e_gs_ser
+ .else
+ module_header _a2_gs_ser
+ .endif
+
+ ; Driver signature
+ .byte $73, $65, $72 ; "ser"
+ .byte SER_API_VERSION ; Serial API version number
+
+ ; Library reference
+ .addr $0000
+
+ ; Jump table
+ .addr SER_INSTALL
+ .addr SER_UNINSTALL
+ .addr SER_OPEN
+ .addr SER_CLOSE
+ .addr SER_GET
+ .addr SER_PUT
+ .addr SER_STATUS
+ .addr SER_IOCTL
+ .addr SER_IRQ
+
+;----------------------------------------------------------------------------
+; Global variables
+
+ .bss
+
+RecvHead: .res 1 ; Head of receive buffer
+RecvTail: .res 1 ; Tail of receive buffer
+RecvFreeCnt: .res 1 ; Number of bytes in receive buffer
+SendHead: .res 1 ; Head of send buffer
+SendTail: .res 1 ; Tail of send buffer
+SendFreeCnt: .res 1 ; Number of bytes in send buffer
+
+Stopped: .res 1 ; Flow-stopped flag
+RtsOff: .res 1
+
+RecvBuf: .res 256 ; Receive buffers: 256 bytes
+SendBuf: .res 256 ; Send buffers: 256 bytes
+
+ .data
+
+Opened: .byte $00 ; 1 when opened
+Channel: .byte $00 ; Channel B by default
+CurChanIrqFlags:.byte INTR_PENDING_RX_EXT_B
+
+SerFlagOrig: .byte $00
+
+; Tables used to translate cc65 RS232 params into register values
+; (Ref page 5-18 and 5-19)
+BaudLowTable: .byte $7E ; SER_BAUD_300
+ .byte $5E ; SER_BAUD_1200
+ .byte $2E ; SER_BAUD_2400
+ .byte $16 ; SER_BAUD_4800
+ .byte $0A ; SER_BAUD_9600
+ .byte $04 ; SER_BAUD_19200
+ .byte $01 ; SER_BAUD_38400
+ .byte $00 ; SER_BAUD_57600
+
+BaudHighTable: .byte $01 ; SER_BAUD_300
+ .byte $00 ; SER_BAUD_1200
+ .byte $00 ; SER_BAUD_2400
+ .byte $00 ; SER_BAUD_4800
+ .byte $00 ; SER_BAUD_9600
+ .byte $00 ; SER_BAUD_19200
+ .byte $00 ; SER_BAUD_38400
+ .byte $00 ; SER_BAUD_57600
+
+RxBitTable: .byte %00000000 ; SER_BITS_5, in WR_RX_CTRL (WR3)
+ .byte %10000000 ; SER_BITS_6 (Ref page 5-7)
+ .byte %01000000 ; SER_BITS_7
+ .byte %11000000 ; SER_BITS_8
+
+TxBitTable: .byte %00000000 ; SER_BITS_5, in WR_TX_CTRL (WR5)
+ .byte %01000000 ; SER_BITS_6 (Ref page 5-9)
+ .byte %00100000 ; SER_BITS_7
+ .byte %01100000 ; SER_BITS_8
+
+ .rodata
+
+BaudTable: ; bit7 = 1 means setting is invalid
+ ; Otherwise refers to the index in
+ ; Baud(Low/High)Table
+ .byte $FF ; SER_BAUD_45_5
+ .byte $FF ; SER_BAUD_50
+ .byte $FF ; SER_BAUD_75
+ .byte $FF ; SER_BAUD_110
+ .byte $FF ; SER_BAUD_134_5
+ .byte $FF ; SER_BAUD_150
+ .byte $00 ; SER_BAUD_300
+ .byte $FF ; SER_BAUD_600
+ .byte $01 ; SER_BAUD_1200
+ .byte $FF ; SER_BAUD_1800
+ .byte $02 ; SER_BAUD_2400
+ .byte $FF ; SER_BAUD_3600
+ .byte $03 ; SER_BAUD_4800
+ .byte $FF ; SER_BAUD_7200
+ .byte $04 ; SER_BAUD_9600
+ .byte $05 ; SER_BAUD_19200
+ .byte $06 ; SER_BAUD_38400
+ .byte $07 ; SER_BAUD_57600
+ .byte $FF ; SER_BAUD_115200
+ .byte $FF ; SER_BAUD_230400
+
+StopTable: .byte %00000100 ; SER_STOP_1, in WR_TX_RX_CTRL (WR4)
+ .byte %00001100 ; SER_STOP_2 (Ref page 5-8)
+
+ParityTable: .byte %00000000 ; SER_PAR_NONE, in WR_TX_RX_CTRL (WR4)
+ .byte %00000001 ; SER_PAR_ODD (Ref page 5-8)
+ .byte %00000011 ; SER_PAR_EVEN
+ .byte $FF ; SER_PAR_MARK
+ .byte $FF ; SER_PAR_SPACE
+
+; ------------------------------------------------------------------------
+; Addresses
+
+SCCAREG := $C039
+SCCBREG := $C038
+SCCADATA := $C03B
+SCCBDATA := $C03A
+
+; We're supposed to get SerFlag's address using GetAddr on ROMs 1 and 3.
+; (https://archive.org/details/IIgs_2523018_SCC_Access, page 9)
+; But, it's the same value as on ROM0. As we don't expect a ROM 4 anytime
+; soon with a different value, let's keep it simple.
+
+SER_FLAG := $E10104
+
+; ------------------------------------------------------------------------
+; Write registers, read registers, and values that interest us
+
+WR_INIT_CTRL = 0
+RR_INIT_STATUS = 0
+INIT_CTRL_CLEAR_EIRQ = %00010000
+INIT_CTRL_CLEAR_ERR = %00110000
+INIT_STATUS_READY = %00000100
+INIT_STATUS_RTS = %00100000
+
+WR_TX_RX_MODE_CTRL = 1
+TX_RX_MODE_OFF = %00000000
+TX_RX_MODE_RXIRQ = %00010001
+
+WR_RX_CTRL = 3 ; (Ref page 5-7)
+RR_RX_STATUS = 9 ; Corresponding status register
+RX_CTRL_ON = %00000001 ; ORed, Rx enabled
+RX_CTRL_OFF = %11111110 ; ANDed,Rx disabled
+
+WR_TX_RX_CTRL = 4
+RR_TX_RX_STATUS = 4
+TX_RX_CLOCK_MUL = %01000000 ; Clock x16 (Ref page 5-8)
+
+WR_TX_CTRL = 5 ; (Ref page 5-9)
+RR_TX_STATUS = 5 ; Corresponding status register
+TX_CTRL_ON = %00001000 ; ORed, Tx enabled
+TX_CTRL_OFF = %11110111 ; ANDed,Tx disabled
+TX_DTR_ON = %01111111 ; ANDed,DTR ON (high)
+TX_DTR_OFF = %10000000 ; ORed, DTR OFF
+TX_RTS_ON = %00000010 ; ORed, RTS ON (low)
+TX_RTS_OFF = %11111101 ; ANDed, RTS OFF
+
+WR_MASTER_IRQ_RST = 9 ; (Ref page 5-14)
+MASTER_IRQ_SHUTDOWN = %00000010 ; STA'd
+MASTER_IRQ_MIE_RST = %00001010 ; STA'd
+MASTER_IRQ_SET = %00011001 ; STA'd
+
+WR_CLOCK_CTRL = 11 ; (Ref page 5-17)
+CLOCK_CTRL_CH_A = %11010000
+CLOCK_CTRL_CH_B = %01010000
+
+WR_BAUDL_CTRL = 12 ; (Ref page 5-18)
+WR_BAUDH_CTRL = 13 ; (Ref page 5-19)
+
+WR_MISC_CTRL = 14 ; (Ref page 5-19)
+MISC_CTRL_RATE_GEN_ON = %00000001 ; ORed
+MISC_CTRL_RATE_GEN_OFF = %11111110 ; ANDed
+
+WR_IRQ_CTRL = 15 ; (Ref page 5-20)
+IRQ_CLEANUP_EIRQ = %00001000
+
+RR_SPEC_COND_STATUS = 1 ; (Ref page 5-23)
+SPEC_COND_FRAMING_ERR = %01000000
+SPEC_COND_OVERRUN_ERR = %00100000
+
+RR_IRQ_STATUS = 2 ; (Ref page 5-24)
+IRQ_MASQ = %01110000 ; ANDed
+IRQ_RX = %00100000
+IRQ_SPECIAL = %01100000
+
+RR_INTR_PENDING_STATUS = 3 ; (Ref page 5-25)
+INTR_PENDING_RX_EXT_A = %00101000 ; ANDed (RX or special IRQ)
+INTR_PENDING_RX_EXT_B = %00000101 ; ANDed (RX or special IRQ)
+INTR_IS_RX = %00100100 ; ANDed (RX IRQ, channel A or B)
+
+SER_FLAG_CH_A = %00111000
+SER_FLAG_CH_B = %00000111
+
+ .code
+
+; Read register value to A.
+; Input: X as channel
+; Y as register
+; Output: A
+readSSCReg:
+ cpx #0
+ bne ReadAreg
+ sty SCCBREG
+ lda SCCBREG
+ rts
+ReadAreg:
+ sty SCCAREG
+ lda SCCAREG
+ rts
+
+; Write value of A to a register.
+; Input: X as channel
+; Y as register
+writeSCCReg:
+ cpx #0
+ bne WriteAreg
+ sty SCCBREG
+ sta SCCBREG
+ rts
+WriteAreg:
+ sty SCCAREG
+ sta SCCAREG
+ rts
+
+;----------------------------------------------------------------------------
+; SER_INSTALL: Is called after the driver is loaded into memory. If possible,
+; check if the hardware is present. Must return an SER_ERR_xx code in a/x.
+;
+; Since we don't have to manage the IRQ vector on the Apple II, this is
+; actually the same as:
+;
+; SER_UNINSTALL: Is called before the driver is removed from memory.
+; No return code required (the driver is removed from memory on return).
+;
+; and:
+;
+; SER_CLOSE: Close the port and disable interrupts. Called without parameters.
+; Must return an SER_ERR_xx code in a/x.
+
+SER_INSTALL:
+SER_UNINSTALL:
+SER_CLOSE:
+ ; Check if this is a IIgs (Apple II Miscellaneous TechNote #7,
+ ; Apple II Family Identification)
+ sec
+ bit $C082
+ jsr $FE1F
+ bit $C080
+
+ bcc IIgs
+
+ lda #SER_ERR_NO_DEVICE ; Not a IIgs
+ ldx #$00 ; Promote char return value
+ rts
+
+IIgs:
+ ldx Opened ; Check for open port
+ beq :+
+
+ ldx Channel
+
+ ; Deactivate interrupts
+ sei
+ ldy #WR_MASTER_IRQ_RST
+ lda #MASTER_IRQ_SHUTDOWN
+ jsr writeSCCReg
+
+ ldy #WR_TX_RX_MODE_CTRL
+ lda #TX_RX_MODE_OFF
+ jsr writeSCCReg
+
+ ; Reset SerFlag to what it was
+ lda SerFlagOrig
+ sta SER_FLAG
+
+ lda SCCBDATA
+
+ ; Clear external interrupts (twice)
+ ldy #WR_INIT_CTRL
+ lda #INIT_CTRL_CLEAR_EIRQ
+ jsr writeSCCReg
+ jsr writeSCCReg
+
+ ; Reset MIE for firmware use
+ ldy #WR_MASTER_IRQ_RST
+ lda #MASTER_IRQ_MIE_RST
+ jsr writeSCCReg
+
+ ldx #$00
+ stx Opened ; Mark port as closed
+
+ cli
+: txa ; Promote char return value
+ rts
+
+;----------------------------------------------------------------------------
+; SER_OPEN: A pointer to a ser_params structure is passed in ptr1.
+; Must return an SER_ERR_xx code in a/x.
+
+SER_OPEN:
+ sei
+
+ ; Check if the handshake setting is valid
+ ldy #SER_PARAMS::HANDSHAKE ; Handshake
+ lda (ptr1),y
+ cmp #SER_HS_HW ; This is all we support
+ bne InvParam
+
+ ; Initialize buffers
+ ldy #$00
+ sty Stopped
+ sty RecvHead
+ sty RecvTail
+ sty SendHead
+ sty SendTail
+ dey ; Y = 255
+ sty RecvFreeCnt
+ sty SendFreeCnt
+
+ ldx Channel
+
+ ldy #RR_INIT_STATUS ; Hit rr0 once to sync up
+ jsr readSSCReg
+
+ ldy #WR_MISC_CTRL ; Turn everything off
+ lda #$00
+ jsr writeSCCReg
+
+ ldy #SER_PARAMS::STOPBITS
+ lda (ptr1),y ; Stop bits
+ tay
+ lda StopTable,y ; Get value
+
+ pha
+ ldy #SER_PARAMS::PARITY
+ lda (ptr1),y ; Parity bits
+ tay
+ pla
+ ora ParityTable,y ; Get value
+ bmi InvParam
+
+ ora #TX_RX_CLOCK_MUL
+
+ ldy #WR_TX_RX_CTRL ; Setup stop & parity bits
+ jsr writeSCCReg
+
+ cpx #$00
+ bne ClockA
+ClockB:
+ ldy #WR_CLOCK_CTRL
+ lda #CLOCK_CTRL_CH_B
+ jsr writeSCCReg
+
+ lda #INTR_PENDING_RX_EXT_B ; Store which IRQ bits we'll check
+ sta CurChanIrqFlags
+
+ bra SetBaud
+ClockA:
+ ldy #WR_CLOCK_CTRL
+ lda #CLOCK_CTRL_CH_A
+ jsr writeSCCReg
+
+ lda #INTR_PENDING_RX_EXT_A ; Store which IRQ bits we'll check
+ sta CurChanIrqFlags
+
+SetBaud:
+ ldy #SER_PARAMS::BAUDRATE
+ lda (ptr1),y ; Baudrate index - cc65 value
+ tay
+
+ lda BaudTable,y ; Get chip value from Low/High tables
+ bpl BaudOK ; Verify baudrate is supported
+
+InvParam:
+ lda #SER_ERR_INIT_FAILED
+ ldy #$00 ; Mark port closed
+ bra SetupOut
+
+BaudOK:
+ tay
+
+ lda BaudLowTable,y ; Get low byte
+
+ phy
+ ldy #WR_BAUDL_CTRL
+ jsr writeSCCReg
+ ply
+
+ lda BaudHighTable,y ; Get high byte
+ ldy #WR_BAUDH_CTRL
+ jsr writeSCCReg
+
+ ldy #WR_MISC_CTRL ; Time to turn this thing on
+ lda #MISC_CTRL_RATE_GEN_ON
+ jsr writeSCCReg
+
+ ldy #SER_PARAMS::DATABITS
+ lda (ptr1),y ; Data bits
+ tay
+ lda RxBitTable,y ; Data bits for RX
+ ora #RX_CTRL_ON ; and turn RX on
+
+ phy
+ ldy #WR_RX_CTRL
+ jsr writeSCCReg
+ ply
+
+ lda TxBitTable,y ; Data bits for TX
+ ora #TX_CTRL_ON ; and turn TX on
+ and #TX_DTR_ON
+
+ sta RtsOff ; Save value for flow control
+
+ ora #TX_RTS_ON
+
+ ldy #WR_TX_CTRL
+ jsr writeSCCReg
+
+ ldy #WR_IRQ_CTRL
+ lda #IRQ_CLEANUP_EIRQ
+ jsr writeSCCReg
+
+ ldy #WR_INIT_CTRL ; Clear ext status (write twice)
+ lda #INIT_CTRL_CLEAR_EIRQ
+ jsr writeSCCReg
+ jsr writeSCCReg
+
+ ldy #WR_TX_RX_MODE_CTRL ; Activate RX IRQ
+ lda #TX_RX_MODE_RXIRQ
+ jsr writeSCCReg
+
+ lda SCCBREG ; Activate master IRQ
+ ldy #WR_MASTER_IRQ_RST
+ lda #MASTER_IRQ_SET
+ jsr writeSCCReg
+
+ lda SER_FLAG ; Get SerFlag's current value
+ sta SerFlagOrig ; and save it
+
+ cpx #$00
+ bne IntA
+IntB:
+ ora #SER_FLAG_CH_B ; Inform firmware we want channel B IRQs
+ bra StoreFlag
+IntA:
+ ora #SER_FLAG_CH_A ; Inform firmware we want channel A IRQs
+StoreFlag:
+ sta SER_FLAG
+
+ ldy #$01 ; Mark port opened
+ lda #SER_ERR_OK
+
+SetupOut:
+ ldx #$00 ; Promote char return value
+ sty Opened
+ cli
+ rts
+
+;----------------------------------------------------------------------------
+; SER_GET: Will fetch a character from the receive buffer and store it into the
+; variable pointed to by ptr1. If no data is available, SER_ERR_NO_DATA is
+; returned.
+
+SER_GET:
+ ldx Channel
+
+ lda RecvFreeCnt ; Check for buffer empty
+ cmp #$FF
+ beq NoData
+
+ ldy Stopped ; Check for flow stopped
+ beq :+
+ cmp #63 ; Enough free?
+ bcc :+
+ stz Stopped ; Release flow control
+
+ lda RtsOff
+ ora #TX_RTS_ON
+
+ ldy #WR_TX_CTRL
+ jsr writeSCCReg
+
+: ldy RecvHead ; Get byte from buffer
+ lda RecvBuf,y
+ inc RecvHead
+ inc RecvFreeCnt
+ sta (ptr1)
+ lda #SER_ERR_OK
+ .assert SER_ERR_OK = 0, error
+ tax
+ rts
+NoData:
+ lda #SER_ERR_NO_DATA
+ ldx #$00 ; Promote char return value
+ rts
+
+;----------------------------------------------------------------------------
+; SER_PUT: Output character in A.
+; Must return an SER_ERR_xx code in a/x.
+
+SER_PUT:
+ ldx Channel
+
+ ldy SendFreeCnt ; Anything to send first?
+ iny ; Y = $FF?
+ beq :+
+ pha
+ lda #$00 ; TryHard = false
+ jsr TryToSend
+ pla
+
+: ldy SendFreeCnt ; Do we have room to store byte?
+ bne :+
+ lda #SER_ERR_OVERFLOW
+ ldx #$00
+ rts
+
+: ldy SendTail ; Put byte into send buffer & send
+ sta SendBuf,y
+ inc SendTail
+ dec SendFreeCnt
+ lda #$FF ; TryHard = true
+ jsr TryToSend
+ lda #SER_ERR_OK
+ .assert SER_ERR_OK = 0, error
+ tax
+ rts
+
+;----------------------------------------------------------------------------
+; SER_STATUS: Return the status in the variable pointed to by ptr1.
+; Must return an SER_ERR_xx code in a/x.
+; We provide the read register 0, containing interesting info like
+; INIT_STATUS_READY (hardware handshake status) or INIT_STATUS_RTS
+; (ready to send).
+
+SER_STATUS:
+ ldx Channel
+ lda SCCBREG,x
+ ldx #$00
+ sta (ptr1)
+ .assert SER_ERR_OK = 0, error
+ txa
+ rts
+
+;----------------------------------------------------------------------------
+; SER_IOCTL: Driver defined entry point. The wrapper will pass a pointer to ioctl
+; specific data in ptr1, and the ioctl code in A.
+; Sets communication channel A or B (A = 1, B = 0)
+; Must return an SER_ERR_xx code in a/x.
+
+SER_IOCTL:
+ ora ptr1+1 ; Check data msb and code to be 0
+ bne :+
+
+ ldx ptr1 ; Check data lsb to be 0 or 1
+ bmi :+
+ cpx #$02
+ bcs :+
+
+ stx Channel
+ .assert SER_ERR_OK = 0, error
+ tax
+ rts
+
+: lda #SER_ERR_INV_IOCTL
+ ldx #$00 ; Promote char return value
+ rts
+
+;----------------------------------------------------------------------------
+; SER_IRQ: Called from the builtin runtime IRQ handler as a subroutine. All
+; registers are already saved, no parameters are passed, but the carry flag
+; is clear on entry. The routine must return with carry set if the interrupt
+; was handled, otherwise with carry clear.
+
+SER_IRQ:
+ ldy #RR_INTR_PENDING_STATUS ; IRQ status is always in A reg
+ sty SCCAREG
+ lda SCCAREG
+
+ and CurChanIrqFlags ; Is this ours?
+ beq Done
+
+ and #INTR_IS_RX ; Is this an RX irq?
+ beq CheckSpecial
+
+ ldx Channel
+ lda SCCBDATA,x ; Get byte
+ ldx RecvFreeCnt ; Check if we have free space left
+ beq Flow ; Jump if no space in receive buffer
+ ldy RecvTail ; Load buffer pointer
+ sta RecvBuf,y ; Store received byte in buffer
+ inc RecvTail ; Increment buffer pointer
+ dec RecvFreeCnt ; Decrement free space counter
+ cpx #33
+ bcc Flow ; Assert flow control if buffer space low
+ rts ; Interrupt handled (carry already set)
+
+CheckSpecial:
+ ; Always check IRQ special flags from Channel B (Ref page 5-24)
+ ldy #RR_IRQ_STATUS
+ sty SCCBREG
+ lda SCCBREG
+
+ and #IRQ_MASQ
+ cmp #IRQ_SPECIAL
+ beq Special
+
+ ; Clear exint
+ ldx Channel
+ ldy #WR_INIT_CTRL
+ lda #INIT_CTRL_CLEAR_EIRQ
+ jsr writeSCCReg
+
+ sec
+ rts
+
+Flow: ldx Channel ; Assert flow control if buffer space too low
+ ldy #WR_TX_CTRL
+ lda RtsOff
+ jsr writeSCCReg
+
+ sta Stopped
+ sec ; Interrupt handled
+Done: rts
+
+Special:ldx Channel
+ ldy #RR_SPEC_COND_STATUS
+ jsr readSSCReg
+
+ tax
+ and #SPEC_COND_FRAMING_ERR
+ bne BadChar
+ txa
+ and #SPEC_COND_OVERRUN_ERR
+ beq BadChar
+
+ ldy #WR_INIT_CTRL
+ lda #INIT_CTRL_CLEAR_ERR
+ jsr writeSCCReg
+
+ sec
+ rts
+
+BadChar:
+ lda SCCBDATA,x ; Remove char in error
+ sec
+ rts
+
+;----------------------------------------------------------------------------
+; Try to send a byte. Internal routine. A = TryHard, X = Channel
+
+TryToSend:
+ sta tmp1 ; Remember tryHard flag
+Again: lda SendFreeCnt ; Anything to send?
+ cmp #$FF
+ beq Quit ; No
+
+ lda Stopped ; Check for flow stopped
+ bne Quit ; Bail out if it is
+
+Wait:
+ lda SCCBREG,x ; Check that we're ready to send
+ tay
+ and #INIT_STATUS_READY
+ beq NotReady
+
+ tya
+ and #INIT_STATUS_RTS ; Ready to send
+ bne Send
+
+NotReady:
+ bit tmp1 ; Keep trying if must try hard
+ bmi Wait
+Quit: rts
+
+Send: ldy SendHead ; Send byte
+ lda SendBuf,y
+
+ sta SCCBDATA,x
+
+ inc SendHead
+ inc SendFreeCnt
+ jmp Again ; Continue flushing TX buffer
diff --git a/libsrc/apple2/ser/a2.ssc.s b/libsrc/apple2/ser/a2.ssc.s
index 6ad9c3825..022ef2fd5 100644
--- a/libsrc/apple2/ser/a2.ssc.s
+++ b/libsrc/apple2/ser/a2.ssc.s
@@ -26,6 +26,7 @@
.include "ser-error.inc"
.macpack module
+ .macpack cpu
; ------------------------------------------------------------------------
; Header. Includes jump table
@@ -37,8 +38,8 @@
.endif
; Driver signature
- .byte $73, $65, $72 ; "ser"
- .byte SER_API_VERSION ; Serial API version number
+ .byte $73, $65, $72 ; "ser"
+ .byte SER_API_VERSION ; Serial API version number
; Library reference
.addr $0000
@@ -57,13 +58,17 @@
;----------------------------------------------------------------------------
; I/O definitions
+.if (.cpu .bitand CPU_ISET_65C02)
+ACIA := $C088
+.else
Offset = $8F ; Move 6502 false read out of I/O to page $BF
+ACIA := $C088-Offset
+.endif
-ACIA = $C088-Offset
-ACIA_DATA = ACIA+0 ; Data register
-ACIA_STATUS = ACIA+1 ; Status register
-ACIA_CMD = ACIA+2 ; Command register
-ACIA_CTRL = ACIA+3 ; Control register
+ACIA_DATA := ACIA+0 ; Data register
+ACIA_STATUS := ACIA+1 ; Status register
+ACIA_CMD := ACIA+2 ; Command register
+ACIA_CTRL := ACIA+3 ; Control register
;----------------------------------------------------------------------------
; Global variables
@@ -72,16 +77,17 @@ ACIA_CTRL = ACIA+3 ; Control register
RecvHead: .res 1 ; Head of receive buffer
RecvTail: .res 1 ; Tail of receive buffer
-RecvFreeCnt: .res 1 ; Number of bytes in receive buffer
+RecvFreeCnt: .res 1 ; Number of free bytes in receive buffer
SendHead: .res 1 ; Head of send buffer
SendTail: .res 1 ; Tail of send buffer
-SendFreeCnt: .res 1 ; Number of bytes in send buffer
+SendFreeCnt: .res 1 ; Number of free bytes in send buffer
Stopped: .res 1 ; Flow-stopped flag
-RtsOff: .res 1 ;
+RtsOff: .res 1 ; Cached value of command register with
+ ; flow stopped
-RecvBuf: .res 256 ; Receive buffers: 256 bytes
-SendBuf: .res 256 ; Send buffers: 256 bytes
+RecvBuf: .res 256 ; Receive buffer: 256 bytes
+SendBuf: .res 256 ; Send buffer: 256 bytes
Index: .res 1 ; I/O register index
@@ -91,8 +97,9 @@ Slot: .byte $02 ; Default to SSC in slot 2
.rodata
- ; Tables used to translate RS232 params into register values
-BaudTable: ; bit7 = 1 means setting is invalid
+BaudTable: ; Table used to translate RS232 baudrate param
+ ; into control register value
+ ; bit7 = 1 means setting is invalid
.byte $FF ; SER_BAUD_45_5
.byte $01 ; SER_BAUD_50
.byte $02 ; SER_BAUD_75
@@ -113,30 +120,61 @@ BaudTable: ; bit7 = 1 means setting is invalid
.byte $FF ; SER_BAUD_57600
.byte $FF ; SER_BAUD_115200
.byte $FF ; SER_BAUD_230400
-BitTable:
+
+BitTable: ; Table used to translate RS232 databits param
+ ; into control register value
.byte $60 ; SER_BITS_5
.byte $40 ; SER_BITS_6
.byte $20 ; SER_BITS_7
.byte $00 ; SER_BITS_8
-StopTable:
+
+StopTable: ; Table used to translate RS232 stopbits param
+ ; into control register value
.byte $00 ; SER_STOP_1
.byte $80 ; SER_STOP_2
-ParityTable:
+
+ParityTable: ; Table used to translate RS232 parity param
+ ; into command register value
.byte $00 ; SER_PAR_NONE
.byte $20 ; SER_PAR_ODD
.byte $60 ; SER_PAR_EVEN
.byte $A0 ; SER_PAR_MARK
.byte $E0 ; SER_PAR_SPACE
-IdOfsTable:
+
+IdOfsTable: ; Table of bytes positions, used to check five
+ ; specific bytes on the slot's firmware to make
+ ; sure this is an SSC (or Apple //c comm port)
+ ; firmware that drives an ACIA 6551 chip.
+ ;
+ ; The SSC firmware and the Apple //c(+) comm
+ ; port firmware all begin with a BIT instruction.
+ ; The IIgs, on the other hand, has a
+ ; Zilog Z8530 chip and its firmware starts with
+ ; a SEP instruction. We don't want to load this
+ ; driver on the IIgs' serial port. We'll
+ ; differentiate the firmware on this byte.
+ ;
+ ; The next four bytes we check are the Pascal
+ ; Firmware Protocol Bytes that identify a
+ ; serial card. Those are the same bytes for
+ ; SSC firmwares, Apple //c firmwares and IIgs
+ ; Zilog Z8530 firmwares - which is the reason
+ ; we have to check for the firmware's first
+ ; instruction too.
+ .byte $00 ; First instruction
.byte $05 ; Pascal 1.0 ID byte
.byte $07 ; Pascal 1.0 ID byte
.byte $0B ; Pascal 1.1 generic signature byte
.byte $0C ; Device signature byte
-IdValTable:
- .byte $38 ; Fixed
- .byte $18 ; Fixed
- .byte $01 ; Fixed
- .byte $31 ; Serial or parallel I/O card type 1
+
+IdValTable: ; Table of expected values for the five checked
+ ; bytes
+ .byte $2C ; BIT
+ .byte $38 ; ID Byte 0 (from Pascal 1.0), fixed
+ .byte $18 ; ID Byte 1 (from Pascal 1.0), fixed
+ .byte $01 ; Generic signature for Pascal 1.1, fixed
+ .byte $31 ; Device signature byte (serial or
+ ; parallel I/O card type 1)
IdTableLen = * - IdValTable
@@ -163,12 +201,10 @@ SER_CLOSE:
ldx Index ; Check for open port
beq :+
- ; Deactivate DTR and disable 6551 interrupts
- lda #%00001010
+ lda #%00001010 ; Deactivate DTR and disable 6551 interrupts
sta ACIA_CMD,x
- ; Done, return an error code
-: lda #SER_ERR_OK
+: lda #SER_ERR_OK ; Done, return an error code
.assert SER_ERR_OK = 0, error
tax
stx Index ; Mark port as closed
@@ -185,96 +221,96 @@ SER_OPEN:
ora Slot
sta ptr2+1
- ; Check Pascal 1.1 Firmware Protocol ID bytes
-: ldy IdOfsTable,x
+: ldy IdOfsTable,x ; Check Pascal 1.1 Firmware Protocol ID bytes
lda IdValTable,x
cmp (ptr2),y
- bne NoDevice
+ bne NoDev
inx
cpx #IdTableLen
bcc :-
- ; Convert slot to I/O register index
- lda Slot
+ lda Slot ; Convert slot to I/O register index
asl
asl
asl
asl
- adc #Offset ; Assume carry to be clear
+.if .not (.cpu .bitand CPU_ISET_65C02)
+ adc #Offset ; Assume carry to be clear
+.endif
tax
; Check if the handshake setting is valid
- ldy #SER_PARAMS::HANDSHAKE ; Handshake
+ ldy #SER_PARAMS::HANDSHAKE
lda (ptr1),y
- cmp #SER_HS_HW ; This is all we support
- bne InvParam
+ cmp #SER_HS_HW ; This is all we support
+ bne InvParm
- ; Initialize buffers
- ldy #$00
+ ldy #$00 ; Initialize buffers
sty Stopped
sty RecvHead
sty RecvTail
sty SendHead
sty SendTail
- dey ; Y = 255
+ dey ; Y = 255
sty RecvFreeCnt
sty SendFreeCnt
; Set the value for the control register, which contains stop bits,
; word length and the baud rate.
ldy #SER_PARAMS::BAUDRATE
- lda (ptr1),y ; Baudrate index
+ lda (ptr1),y ; Baudrate index
tay
- lda BaudTable,y ; Get 6551 value
- bmi InvBaud ; Branch if rate not supported
+ lda BaudTable,y ; Get 6551 value
+ bmi InvBaud ; Branch if rate not supported
sta tmp1
- ldy #SER_PARAMS::DATABITS ; Databits
- lda (ptr1),y
+ ldy #SER_PARAMS::DATABITS
+ lda (ptr1),y ; Databits index
tay
- lda BitTable,y
+ lda BitTable,y ; Get 6551 value
ora tmp1
sta tmp1
- ldy #SER_PARAMS::STOPBITS ; Stopbits
- lda (ptr1),y
+ ldy #SER_PARAMS::STOPBITS
+ lda (ptr1),y ; Stopbits index
tay
- lda StopTable,y
+ lda StopTable,y ; Get 6551 value
ora tmp1
- ora #%00010000 ; Receiver clock source = baudrate
+ ora #%00010000 ; Set receiver clock source = baudrate
sta ACIA_CTRL,x
; Set the value for the command register. We remember the base value
; in RtsOff, since we will have to manipulate ACIA_CMD often.
- ldy #SER_PARAMS::PARITY ; Parity
- lda (ptr1),y
+ ldy #SER_PARAMS::PARITY
+ lda (ptr1),y ; Parity index
tay
- lda ParityTable,y
- ora #%00000001 ; DTR active
- sta RtsOff
- ora #%00001000 ; Enable receive interrupts
+ lda ParityTable,y ; Get 6551 value
+
+ ora #%00000001 ; Set DTR active
+ sta RtsOff ; Store value to easily handle flow control later
+ ora #%00001000 ; Enable receive interrupts (RTS low)
sta ACIA_CMD,x
; Done
- stx Index ; Mark port as open
+ stx Index ; Mark port as open
lda #SER_ERR_OK
.assert SER_ERR_OK = 0, error
tax
rts
; Device (hardware) not found
-NoDevice:lda #SER_ERR_NO_DEVICE
- ldx #0 ; return value is char
+NoDev: lda #SER_ERR_NO_DEVICE
+ ldx #$00 ; Promote char return value
rts
; Invalid parameter
-InvParam:lda #SER_ERR_INIT_FAILED
- ldx #0 ; return value is char
+InvParm:lda #SER_ERR_INIT_FAILED
+ ldx #$00 ; Promote char return value
rts
; Baud rate not available
InvBaud:lda #SER_ERR_BAUD_UNAVAIL
- ldx #0 ; return value is char
+ ldx #$00 ; Promote char return value
rts
;----------------------------------------------------------------------------
@@ -284,38 +320,38 @@ InvBaud:lda #SER_ERR_BAUD_UNAVAIL
SER_GET:
ldx Index
- ldy SendFreeCnt ; Send data if necessary
- iny ; Y == $FF?
- beq :+
- lda #$00 ; TryHard = false
- jsr TryToSend
- ; Check for buffer empty
-: lda RecvFreeCnt ; (25)
+ lda RecvFreeCnt ; Check for buffer empty
cmp #$FF
bne :+
lda #SER_ERR_NO_DATA
- ldx #0 ; return value is char
+ ldx #$00 ; Promote char return value
rts
- ; Check for flow stopped & enough free: release flow control
-: ldy Stopped ; (34)
+: ldy Stopped ; Check for flow stopped
beq :+
- cmp #63
+ cmp #63 ; Enough free?
bcc :+
+.if (.cpu .bitand CPU_ISET_65C02)
+ stz Stopped ; Release flow control
+.else
lda #$00
sta Stopped
+.endif
lda RtsOff
ora #%00001000
sta ACIA_CMD,x
- ; Get byte from buffer
-: ldy RecvHead ; (41)
+: ldy RecvHead ; Get byte from buffer
lda RecvBuf,y
inc RecvHead
inc RecvFreeCnt
- ldx #$00 ; (59)
+ ldx #$00
+.if (.cpu .bitand CPU_ISET_65C02)
+ sta (ptr1) ; Store it for caller
+.else
sta (ptr1,x)
+.endif
txa ; Return code = 0
rts
@@ -326,28 +362,26 @@ SER_GET:
SER_PUT:
ldx Index
- ; Try to send
- ldy SendFreeCnt
- iny ; Y = $FF?
+ ldy SendFreeCnt ; Anything to send first?
+ cpy #$FF ; No
beq :+
pha
lda #$00 ; TryHard = false
- jsr TryToSend
+ jsr TryToSend ; Try to flush send buffer
pla
- ; Put byte into send buffer & send
-: ldy SendFreeCnt
+ ldy SendFreeCnt ; Reload SendFreeCnt after TryToSend
bne :+
lda #SER_ERR_OVERFLOW
- ldx #0 ; return value is char
+ ldx #$00 ; Promote char return value
rts
-: ldy SendTail
+: ldy SendTail ; Put byte into send buffer
sta SendBuf,y
inc SendTail
dec SendFreeCnt
lda #$FF ; TryHard = true
- jsr TryToSend
+ jsr TryToSend ; Flush send buffer
lda #SER_ERR_OK
.assert SER_ERR_OK = 0, error
tax
@@ -369,26 +403,25 @@ SER_STATUS:
;----------------------------------------------------------------------------
; SER_IOCTL: Driver defined entry point. The wrapper will pass a pointer to ioctl
; specific data in ptr1, and the ioctl code in A.
+; The ioctl data is the slot number to open.
; Must return an SER_ERR_xx code in a/x.
SER_IOCTL:
- ; Check data msb and code to be 0
- ora ptr1+1
+ ora ptr1+1 ; Check data msb and code to be 0
bne :+
- ; Check data lsb to be [1..7]
- ldx ptr1
+ ldx ptr1 ; Check data lsb to be [1..7]
beq :+
cpx #7+1
bcs :+
- stx Slot
+ stx Slot ; Store slot
.assert SER_ERR_OK = 0, error
tax
rts
: lda #SER_ERR_INV_IOCTL
- ldx #0 ; return value is char
+ ldx #$00 ; Promote char return value
rts
;----------------------------------------------------------------------------
@@ -404,19 +437,18 @@ SER_IRQ:
and #$08
beq Done ; Jump if no ACIA interrupt
lda ACIA_DATA,x ; Get byte from ACIA
- ldy RecvFreeCnt ; Check if we have free space left
+ ldx RecvFreeCnt ; Check if we have free space left
beq Flow ; Jump if no space in receive buffer
ldy RecvTail ; Load buffer pointer
sta RecvBuf,y ; Store received byte in buffer
inc RecvTail ; Increment buffer pointer
dec RecvFreeCnt ; Decrement free space counter
- ldy RecvFreeCnt ; Check for buffer space low
- cpy #33
+ cpx #33 ; Check for buffer space low
bcc Flow ; Assert flow control if buffer space low
rts ; Interrupt handled (carry already set)
- ; Assert flow control if buffer space too low
-Flow: lda RtsOff
+Flow: ldx Index ; Assert flow control if buffer space too low
+lda RtsOff
sta ACIA_CMD,x
sta Stopped
sec ; Interrupt handled
@@ -427,26 +459,24 @@ Done: rts
TryToSend:
sta tmp1 ; Remember tryHard flag
-Again: lda SendFreeCnt
- cmp #$FF
- beq Quit ; Bail out
+NextByte:
+ lda SendFreeCnt ; Is there anything to send? This can happen if
+ cmp #$FF ; we got interrupted by RX while sending, and
+ beq Quit ; flow control was asserted.
- ; Check for flow stopped
- lda Stopped
- bne Quit ; Bail out
+Again: lda Stopped ; Is flow stopped?
+ bne Quit ; Yes, Bail out
- ; Check that ACIA is ready to send
- lda ACIA_STATUS,x
+ lda ACIA_STATUS,x ; Check that ACIA is ready to send
and #$10
- bne Send
+ bne Send ; It is!
bit tmp1 ; Keep trying if must try hard
bmi Again
Quit: rts
- ; Send byte and try again
-Send: ldy SendHead
+Send: ldy SendHead ; Get first byte to send
lda SendBuf,y
- sta ACIA_DATA,x
+ sta ACIA_DATA,x ; Send it
inc SendHead
inc SendFreeCnt
- jmp Again
+ jmp NextByte ; And try next one
diff --git a/libsrc/atmos/ser/atmos-acia.s b/libsrc/atmos/ser/atmos-acia.s
index f679125d1..1509803d2 100644
--- a/libsrc/atmos/ser/atmos-acia.s
+++ b/libsrc/atmos/ser/atmos-acia.s
@@ -227,14 +227,8 @@ InvBaud:lda #, 2023-09-06
+;
+; int __fastcall__ ntohl (long val);
+;
+
+.export _ntohl, _htonl
+.import popa
+.importzp tmp1, tmp2, sreg
+
+_htonl := _ntohl
+
+_ntohl:
+ ; The parts of our 32 bit word
+ ; are in sreg+1, sreg, X, A.
+
+ ; Save A and X
+ stx tmp1
+ sta tmp2
+
+ ; Invert high word
+ lda sreg+1
+ ldx sreg
+
+ ; Invert low word
+ ldy tmp1
+ sty sreg
+
+ ldy tmp2
+ sty sreg+1
+
+ rts
diff --git a/libsrc/common/ntohs.s b/libsrc/common/ntohs.s
new file mode 100644
index 000000000..042ddb005
--- /dev/null
+++ b/libsrc/common/ntohs.s
@@ -0,0 +1,16 @@
+;
+; Colin Leroy-Mira , 2023-09-06
+;
+; int __fastcall__ ntohs (int val);
+;
+
+.export _ntohs, _htons
+.importzp tmp1
+
+_htons := _ntohs
+
+_ntohs:
+ sta tmp1
+ txa
+ ldx tmp1
+ rts
diff --git a/libsrc/conio/cputs.s b/libsrc/conio/cputs.s
index 41191a0b0..62e757b84 100644
--- a/libsrc/conio/cputs.s
+++ b/libsrc/conio/cputs.s
@@ -8,28 +8,46 @@
.export _cputsxy, _cputs
.import gotoxy, _cputc
.importzp ptr1, tmp1
+ .macpack cpu
_cputsxy:
sta ptr1 ; Save s for later
stx ptr1+1
jsr gotoxy ; Set cursor, pop x and y
+.if (.cpu .bitand CPU_ISET_65SC02)
+ bra L0 ; Same as cputs...
+.else
jmp L0 ; Same as cputs...
+.endif
_cputs: sta ptr1 ; Save s
stx ptr1+1
-L0: ldy #0
-L1: lda (ptr1),y
- beq L9 ; Jump if done
+
+.if (.cpu .bitand CPU_ISET_65SC02)
+
+L0: lda (ptr1) ; (5)
+ beq L9 ; (7) Jump if done
+ jsr _cputc ; (13) Output char, advance cursor
+ inc ptr1 ; (18) Bump low byte
+ bne L0 ; (20) Next char
+ inc ptr1+1 ; (25) Bump high byte
+ bne L0
+
+.else
+
+L0: ldy #0 ; (2)
+L1: lda (ptr1),y ; (7)
+ beq L9 ; (9) Jump if done
iny
- sty tmp1 ; Save offset
- jsr _cputc ; Output char, advance cursor
- ldy tmp1 ; Get offset
- bne L1 ; Next char
- inc ptr1+1 ; Bump high byte
+ sty tmp1 ; (14) Save offset
+ jsr _cputc ; (20) Output char, advance cursor
+ ldy tmp1 ; (23) Get offset
+ bne L1 ; (25) Next char
+ inc ptr1+1 ; (30) Bump high byte
bne L1
+.endif
+
; Done
L9: rts
-
-
diff --git a/libsrc/conio/vcprintf.s b/libsrc/conio/vcprintf.s
index 084efe089..595a2d2c5 100644
--- a/libsrc/conio/vcprintf.s
+++ b/libsrc/conio/vcprintf.s
@@ -10,7 +10,7 @@
.importzp sp, ptr1, ptr2, ptr3, tmp1
.macpack generic
-
+ .macpack cpu
.data
@@ -74,21 +74,40 @@ out: jsr popax ; count
; Loop outputting characters
+.if (.cpu .bitand CPU_ISET_65SC02)
+
@L1: dec outdesc+6
beq @L4
-@L2: ldy tmp1
- lda (ptr1),y
- iny
- bne @L3
- inc ptr1+1
-@L3: sty tmp1
- jsr _cputc
- jmp @L1
+@L2: lda (ptr1) ; (5)
+ inc ptr1 ; (10)
+ bne @L3 ; (12)
+ inc ptr1+1 ; (17)
+@L3: jsr _cputc ; (23)
+ bra @L1 ; (26)
@L4: dec outdesc+7
bne @L2
rts
+.else
+
+@L1: dec outdesc+6
+ beq @L4
+@L2: ldy tmp1 ; (3)
+ lda (ptr1),y ; (8)
+ iny ; (10)
+ bne @L3 ; (12)
+ inc ptr1+1 ; (17)
+@L3: sty tmp1 ; (20)
+ jsr _cputc ; (26)
+ jmp @L1 ; (32)
+
+@L4: dec outdesc+7
+ bne @L2
+ rts
+
+.endif
+
; ----------------------------------------------------------------------------
; vcprintf - formatted console i/o
;
diff --git a/libsrc/creativision/cputc.s b/libsrc/creativision/cputc.s
index 437b738b2..4389234c1 100644
--- a/libsrc/creativision/cputc.s
+++ b/libsrc/creativision/cputc.s
@@ -95,12 +95,6 @@ IS_UPPER:
BAD_CHAR:
jmp plot
-;-----------------------------------------------------------------------------
-; Initialize the conio subsystem. "INIT" segment is nothing special on the
-; Creativision, it is part of the "ROM" memory.
-
-.segment "INIT"
-
initconio:
lda #$0
sta SCREEN_PTR
diff --git a/libsrc/kim1/scandisplay.s b/libsrc/kim1/scandisplay.s
index 0f46a5de4..768adb2b9 100644
--- a/libsrc/kim1/scandisplay.s
+++ b/libsrc/kim1/scandisplay.s
@@ -15,7 +15,6 @@
sta $FA ; Middle display data
jsr popa
sta $FB ; Leftmost display data
- jsr SCANDS
- rts
+ jmp SCANDS
.endproc
diff --git a/libsrc/lynx/extzp.inc b/libsrc/lynx/extzp.inc
index 2b0f68701..7103ff5b6 100644
--- a/libsrc/lynx/extzp.inc
+++ b/libsrc/lynx/extzp.inc
@@ -12,10 +12,6 @@
.global __iodir: zp
.global __viddma: zp
.global __sprsys: zp
- .global _abc_score_ptr0: zp
- .global _abc_score_ptr1: zp
- .global _abc_score_ptr2: zp
- .global _abc_score_ptr3: zp
.global _FileEntry: zp
.global _FileStartBlock: zp
.global _FileBlockOffset: zp
@@ -25,6 +21,3 @@
.global _FileCurrBlock: zp
.global _FileBlockByte: zp
.global _FileDestPtr: zp
-
-
-
diff --git a/libsrc/lynx/extzp.s b/libsrc/lynx/extzp.s
index f22cfaefb..df53c3d9a 100644
--- a/libsrc/lynx/extzp.s
+++ b/libsrc/lynx/extzp.s
@@ -16,13 +16,6 @@ __iodir: .res 1
__viddma: .res 1
__sprsys: .res 1
-; ------------------------------------------------------------------------
-; sound effect pointers for multitimbral Lynx music hardware
-_abc_score_ptr0: .res 2
-_abc_score_ptr1: .res 2
-_abc_score_ptr2: .res 2
-_abc_score_ptr3: .res 2
-
; ------------------------------------------------------------------------
; Filesystem variables needed for reading stuff from the Lynx cart
_FileEntry: ; The file directory entry is 8 bytes
@@ -35,4 +28,3 @@ _FileFileLen: .res 2
_FileCurrBlock: .res 1
_FileBlockByte: .res 2
_FileDestPtr: .res 2
-
diff --git a/libsrc/plus4/ser/plus4-stdser.s b/libsrc/plus4/ser/plus4-stdser.s
index fbdc61b2e..77445c7a2 100644
--- a/libsrc/plus4/ser/plus4-stdser.s
+++ b/libsrc/plus4/ser/plus4-stdser.s
@@ -252,15 +252,10 @@ InvBaud:
;
SER_GET:
- ldx SendFreeCnt ; Send data if necessary
- inx ; X == $FF?
- beq @L1
- lda #$00
- jsr TryToSend
; Check for buffer empty
-@L1: lda RecvFreeCnt ; (25)
+ lda RecvFreeCnt ; (25)
cmp #$ff
bne @L2
lda #SER_ERR_NO_DATA
@@ -300,21 +295,23 @@ SER_PUT:
; Try to send
ldx SendFreeCnt
- inx ; X = $ff?
+ cpx #$ff ; Nothing to flush
beq @L2
pha
lda #$00
jsr TryToSend
pla
-; Put byte into send buffer & send
+; Reload SendFreeCnt after TryToSend
-@L2: ldx SendFreeCnt
- bne @L3
+ ldx SendFreeCnt
+ bne @L2
lda #SER_ERR_OVERFLOW ; X is already zero
rts
-@L3: ldx SendTail
+; Put byte into send buffer & send
+
+@L2: ldx SendTail
sta SendBuf,x
inc SendTail
dec SendFreeCnt
@@ -387,25 +384,25 @@ SER_IRQ:
sta tmp1 ; Remember tryHard flag
@L0: lda SendFreeCnt
cmp #$ff
- beq @L3 ; Bail out
+ beq @L2 ; Bail out
; Check for flow stopped
@L1: lda Stopped
- bne @L3 ; Bail out
+ bne @L2 ; Bail out
; Check that swiftlink is ready to send
-@L2: lda ACIA_STATUS
+ lda ACIA_STATUS
and #$10
- bne @L4
+ bne @L3
bit tmp1 ;keep trying if must try hard
- bmi @L0
-@L3: rts
+ bmi @L1
+@L2: rts
; Send byte and try again
-@L4: ldx SendHead
+@L3: ldx SendHead
lda SendBuf,x
sta ACIA_DATA
inc SendHead
diff --git a/libsrc/serial/ser-kernel.s b/libsrc/serial/ser-kernel.s
index b6c57a3b5..1514bcf77 100644
--- a/libsrc/serial/ser-kernel.s
+++ b/libsrc/serial/ser-kernel.s
@@ -7,6 +7,7 @@
.import return0, ser_libref
.importzp ptr1
.interruptor ser_irq, 29 ; Export as high priority IRQ handler
+ .destructor _ser_uninstall
.include "ser-kernel.inc"
.include "ser-error.inc"
@@ -44,7 +45,16 @@ ser_sig: .byte $73, $65, $72, SER_API_VERSION ; "ser", version
_ser_install:
- sta _ser_drv
+ ldy _ser_drv ; Check no driver is installed
+ bne ErrInstalled
+ ldy _ser_drv+1
+ beq :+
+ErrInstalled:
+ ldx #$00
+ lda #SER_ERR_INSTALLED
+ rts
+
+: sta _ser_drv
sta ptr1
stx _ser_drv+1
stx ptr1+1
@@ -107,7 +117,14 @@ copy: lda (ptr1),y
; */
_ser_uninstall:
- jsr ser_uninstall ; Call driver routine
+ ldx _ser_drv ; Check a driver is installed
+ bne :+
+ ldx _ser_drv+1
+ bne :+
+ lda #SER_ERR_NO_DRIVER
+ rts
+
+: jsr ser_uninstall ; Call driver routine
lda #$60 ; RTS opcode
sta ser_irq ; Disable IRQ entry point
@@ -117,5 +134,6 @@ _ser_clear_ptr: ; External entry point
sta _ser_drv
sta _ser_drv+1 ; Clear the driver pointer
+done:
tax
rts ; Return zero
diff --git a/src/ca65/instr.c b/src/ca65/instr.c
index 89162c3c6..da6bd6e44 100644
--- a/src/ca65/instr.c
+++ b/src/ca65/instr.c
@@ -1618,7 +1618,7 @@ static void PutJMP (const InsDesc* Ins)
if (EvalEA (Ins, &A)) {
/* Check for indirect addressing */
- if ((A.AddrModeBit & AM65_ABS_IND) && (CPU < CPU_65SC02)) {
+ if ((A.AddrModeBit & AM65_ABS_IND) && (CPU < CPU_65SC02) && (RelaxChecks == 0)) {
/* Compare the low byte of the expression to 0xFF to check for
** a page cross. Be sure to use a copy of the expression otherwise
@@ -1631,7 +1631,7 @@ static void PutJMP (const InsDesc* Ins)
unsigned Msg = GetStringId ("\"jmp (abs)\" across page border");
/* Generate the assertion */
- AddAssertion (E, ASSERT_ACT_WARN, Msg);
+ AddAssertion (E, ASSERT_ACT_ERROR, Msg);
}
/* No error, output code */
diff --git a/src/cc65.props b/src/cc65.props
index ef5a37fea..19fb0b646 100644
--- a/src/cc65.props
+++ b/src/cc65.props
@@ -21,6 +21,7 @@
true
_CRT_NONSTDC_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_WIN32_WINNT=0x0601;WINVER=0x0601;NTDDI_VERSION=0x06010000;%(PreprocessorDefinitions)
common
+ /utf-8 %(AdditionalOptions)
$(IntDir)..\..\common\$(Configuration)\common.lib
@@ -42,13 +43,13 @@
false
- true
MultiThreaded
true
MaxSpeed
+ true
false
false
@@ -57,6 +58,7 @@
true
true
UseLinkTimeCodeGeneration
+ /EMITTOOLVERSIONINFO:NO /NOVCFEATURE /NOCOFFGRPINFO %(AdditionalOptions)
diff --git a/src/cc65.vcxproj b/src/cc65.vcxproj
index 7e2e8ea8c..556c616b0 100644
--- a/src/cc65.vcxproj
+++ b/src/cc65.vcxproj
@@ -110,6 +110,7 @@
+#include
+
+struct s {
+ union {
+ int8_t a[2][2];
+ char c[sizeof (int8_t) * 2 * 2 + sizeof (int16_t) * 4];
+ };
+ int16_t b[4];
+};
+struct s x = { 1, 2, 3, 4, 5, 6 };
+struct s y = { {{{1, 2}, {3, 4}}}, {5, 6} };
+
+unsigned failures;
+
+int main(void)
+{
+ unsigned i, j;
+
+ for (i = 0; i < 2; ++i)
+ {
+ for (j = 0; j < 2; ++j)
+ {
+ if (x.a[i][j] != y.a[i][j])
+ {
+ ++failures;
+ printf("x.a[%u][%u] = %d\n, expected %d\n", i, j, x.a[i][j], y.a[i][j]);
+ }
+ }
+ }
+
+ for (i = 0; i < 4; ++i)
+ {
+ if (x.b[i] != y.b[i])
+ {
+ ++failures;
+ printf("x.b[%u] = %d\n, expected %d\n", i, x.b[i], y.b[i]);
+ }
+ }
+
+ return failures;
+}
diff --git a/test/todo/inline-asm-1489.c b/test/val/inline-asm-1489.c
similarity index 84%
rename from test/todo/inline-asm-1489.c
rename to test/val/inline-asm-1489.c
index 446831fcf..ec7597e01 100644
--- a/test/todo/inline-asm-1489.c
+++ b/test/val/inline-asm-1489.c
@@ -1,9 +1,11 @@
+#include
#include
#include
#include
#include
+#ifdef __CC65__
#define testasm1(C) (__AX__ = (C), \
asm("and #$3f"),\
__AX__)
@@ -11,6 +13,22 @@
#define testasm2(C) (__A__ = (C), \
asm("and #$3f"),\
__A__)
+#else
+/* Non-cc65 compiler. Just make the code compile and work. */
+uint16_t testasm1(uint16_t C)
+{
+ uint16_t AX = C;
+ AX &= 0x3f;
+ return AX;
+}
+
+uint8_t testasm2(uint8_t C)
+{
+ uint8_t A = C;
+ A &= 0x3f;
+ return A;
+}
+#endif
uint8_t src[32] = { 0x10, 0x41, 0x62, 0x83, 0xb4, 0xf5, 0xe6, 0xc7, 0, 0 };
uint8_t src2[32] = { 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0, 0 };
@@ -47,7 +65,7 @@ void dotest1b(uint8_t *s, uint8_t *d)
void dotest2a (void)
{
char *p = &src2[0];
- uint16_t scaddr=&dest[0];
+ uintptr_t scaddr=&dest[0]; //output to line 11 on the screen
printf("dotest2a\n");
while (*p != 0) {
@@ -59,7 +77,7 @@ void dotest2a (void)
void dotest2b (void)
{
char *p = &src2[0];
- uint16_t scaddr=&dest[0];
+ uintptr_t scaddr=&dest[0]; //output to line 11 on the screen
printf("dotest2b\n");
while (*p != 0) {
diff --git a/test/val/lib_common_htonl.c b/test/val/lib_common_htonl.c
new file mode 100644
index 000000000..53a210a84
--- /dev/null
+++ b/test/val/lib_common_htonl.c
@@ -0,0 +1,34 @@
+/*
+ !!DESCRIPTION!! A small test for htons.
+ !!ORIGIN!!
+ !!LICENCE!!
+ !!AUTHOR!! Colin Leroy-Mira
+*/
+
+#include
+#include
+#include
+
+static unsigned int Failures = 0;
+
+static void CheckHtonl (long input, long expected)
+{
+ long result = htonl(input);
+ if (result != expected) {
+ printf ("htonl error:\n"
+ " result = %ld for %ld, should be %ld\n", result, input, expected);
+ ++Failures;
+ }
+}
+
+int main (void)
+{
+ CheckHtonl(0x00000000, 0x00000000);
+ CheckHtonl(0x12345678, 0x78563412);
+ CheckHtonl(0xAABBCCDD, 0xDDCCBBAA);
+ CheckHtonl(0xFFFFFFFF, 0xFFFFFFFF);
+
+ printf ("Failures: %u\n", Failures);
+
+ return Failures;
+}
diff --git a/test/val/lib_common_htons.c b/test/val/lib_common_htons.c
new file mode 100644
index 000000000..42bbb3d6b
--- /dev/null
+++ b/test/val/lib_common_htons.c
@@ -0,0 +1,34 @@
+/*
+ !!DESCRIPTION!! A small test for htons.
+ !!ORIGIN!!
+ !!LICENCE!!
+ !!AUTHOR!! Colin Leroy-Mira
+*/
+
+#include
+#include
+#include
+
+static unsigned int Failures = 0;
+
+static void CheckHtons (int input, int expected)
+{
+ int result = htons(input);
+ if (result != expected) {
+ printf ("htons error:\n"
+ " result = %d for %d, should be %d\n", result, input, expected);
+ ++Failures;
+ }
+}
+
+int main (void)
+{
+ CheckHtons(0x0000, 0x0000);
+ CheckHtons(0x1234, 0x3412);
+ CheckHtons(0xA0F2, 0xF2A0);
+ CheckHtons(0xFFFF, 0xFFFF);
+
+ printf ("Failures: %u\n", Failures);
+
+ return Failures;
+}