Merge branch 'cc65:master' into kim1

Author: rbergen

.github/workflows/snapshot-on-push-master.yml

@@ -96,6 +96,23 @@ jobs:
           name: cc65-snapshot-win64.zip
           path: cc65-snapshot-win64.zip
 
+      - name: Get the online documents repo.
+        uses: actions/checkout@v2
+        with:
+          repository: cc65/doc
+          path: doc.git
+      - name: Update the online documents.
+        run: |
+          cd doc.git
+          rm *.*
+          cp ../html/*.* .
+          git config user.name "cc65-github"
+          git config user.email "cc65.nomail@github.com"
+          git config push.default simple
+          git add -A
+          git commit -m "Updated from cc65 commit ${GITHUB_SHA}."
+          #git push -v
+
     # enter secrets under "repository secrets"
       - name: Upload snapshot to sourceforge
         uses: nogsantos/scp-deploy@master
@@ -106,6 +123,5 @@ jobs:
           port: ${{ secrets.SSH_PORT }}
           user: ${{ secrets.SSH_USER }}
           key: ${{ secrets.SSH_KEY }}
-          
-      # TODO: Update docs at https://github.com/cc65/doc
+
       # TODO: Publish snapshot zip at https://github.com/cc65/cc65.github.io

Contributing.md

@@ -24,6 +24,10 @@ This is an ongoing controversial topic - everyone knows that. However, the follo
 
 The (bash) scripts used to check the above rules can be found in ```.github/check```. You can also run all checks using ```make check```.
 
+### identifiers and symbol names
+
+* any symbols that are exported from source files and/or appear in header files should not be in the "_symbol" form in C, or "__symbol" form in assembly. This way we evade the problem that "_symbol" may or may not be reserved by that standard.
+
 ### misc
 
 * 80 characters is the desired maximum width of files.  But, it isn't a "strong" rule; sometimes, you will want to type longer lines, in order to keep the parts of expressions or comments together on the same line.
@@ -159,6 +163,13 @@ The only exception to the above are actions that are exclusive to the github act
 
 * the printf family of function does not completely implement all printf modifiers and does not behave as expected in some cases - all this should be documented in detail
 
+## Floating point support
+
+The first step is implementing the datatype "float" as IEEE488 floats. Help welcomed!
+
+* WIP compiler/library changes are here: https://github.com/cc65/cc65/pull/1777
+* free software library with testbench is here: http://www.jhauser.us/arithmetic/
+
 ## Test suite
 
 * specific tests to check the optimizer (rather than the codegenerator) are needed.

README.md

@@ -1,7 +1,7 @@
 # About cc65
 
 cc65 is a complete cross development package for 65(C)02 systems, including
-a powerful macro assembler, a C compiler, linker, librarian and several
+a powerful macro assembler, a C compiler, linker, archiver and several
 other tools. cc65 has C and runtime library support for many of the old 6502 machines.
 For details look at the [Website](https://cc65.github.io).
 

asminc/cx16.inc

@@ -538,11 +538,11 @@ NMIVec          := $0318
 ; YM2151 audio chip
 .struct YM2151
                 .org    $9F40
+  ADDR          .byte
   .union
+  DATA          .byte
   STATUS        .byte
-  ADDR          .byte
   .endunion
-  DATA          .byte
 .endstruct
 
 ; X16 Emulator device

cfg/telestrat.cfg

@@ -1,3 +1,7 @@
+FEATURES {
+    STARTADDRESS: default = $1000;
+}
+
 SYMBOLS {
     __ORIXHDR__:   type = import;
     __STACKSIZE__: type = weak, value = $0800; # 2K stack
@@ -7,7 +11,7 @@ SYMBOLS {
 MEMORY {
     ZP:      file = "", define = yes, start = $00B0,            size = $003A;
     ORIXHDR: file = %O, type   = ro,  start = $0000,            size = $001F;
-    MAIN:    file = %O, define = yes, start = $0800,            size = __RAMEND__ - __MAIN_START__;
+    MAIN:    file = %O, define = yes, start = %S,               size = __RAMEND__ - __MAIN_START__;
     BSS:     file = "",               start = __ONCE_RUN__,     size = __RAMEND__ - __STACKSIZE__ - __ONCE_RUN__;
 }
 SEGMENTS {

cfg/vic20-asm.cfg

@@ -6,7 +6,7 @@ SYMBOLS {
 }
 MEMORY {
     ZP:       file = "", start = $0002,  size = $001A, define = yes;
-    LOADADDR: file = %O, start = $1001, size = $0002;
+    LOADADDR: file = %O, start = %S - 2, size = $0002;
     MAIN:     file = %O, start = %S,     size = $0DF3 - %S;
 }
 SEGMENTS {

doc/atari.sgml

@@ -442,19 +442,7 @@ package delivers the same feature.</em>
 You can switch back to the ATASCII mapping by including
 "<tt/atari_atascii_charmap.h/".
 
-A final note: Since cc65 has currently some difficulties with string merging
-under different mappings, defining remapped strings works only flawlessly
-with static array initialization:
-
-<tscreen><verb>
-#include &lt;atari_screen_charmap.h&gt;
-char pcScreenMappingString[] = "Hello Atari!";
-
-#include &lt;atari_atascii_charmap.h&gt;
-char pcAtasciiMappingString[] = "Hello Atari!";
-</verb></tscreen>
-
-delivers correct results, while
+Example:
 
 <tscreen><verb>
 #include &lt;atari_screen_charmap.h&gt;
@@ -464,8 +452,6 @@ char* pcScreenMappingString = "Hello Atari!";
 char* pcAtasciiMappingString = "Hello Atari!";
 </verb></tscreen>
 
-does not.
-
 <sect1>Keyboard codes<p>
 
 For direct keyboard scanning in conjunction with e.g. the OS location "CH" (764/$2FC),

doc/cc65.sgml

@@ -1202,17 +1202,34 @@ The compiler defines several macros at startup:
 
   This macro is defined if the target is the Commodore Plus/4 (-t plus4).
 
-  <tag><tt>__STDC_HOSTED__</tt></tag>
-
-  This macro is expands to the integer constant 1.
-
   <tag><tt>__SIM6502__</tt></tag>
 
   This macro is defined if the target is sim65 in 6502 mode (-t sim6502).
 
   <tag><tt>__SIM65C02__</tt></tag>
+
   This macro is defined if the target is sim65 in 65C02 mode (-t sim65c02).
 
+  <tag><tt>__STDC_HOSTED__</tt></tag>
+
+  This macro expands to the integer constant 1.
+
+  <tag><tt>__STDC_NO_ATOMICS__</tt></tag>
+
+  This macro expands to the integer constant 1 if the language standard is cc65 (--standard cc65).
+
+  <tag><tt>__STDC_NO_COMPLEX__</tt></tag>
+
+  This macro expands to the integer constant 1 if the language standard is cc65 (--standard cc65).
+
+  <tag><tt>__STDC_NO_THREADS__</tt></tag>
+
+  This macro expands to the integer constant 1 if the language standard is cc65 (--standard cc65).
+
+  <tag><tt>__STDC_NO_VLA__</tt></tag>
+
+  This macro expands to the integer constant 1 if the language standard is cc65 (--standard cc65).
+
   <tag><tt>__SUPERVISION__</tt></tag>
 
   This macro is defined if the target is the Supervision (-t supervision).

include/c64.h

@@ -145,6 +145,7 @@ extern void c64_ram_emd[];
 extern void c64_ramcart_emd[];
 extern void c64_reu_emd[];
 extern void c64_vdc_emd[];
+extern void c64_rrr_emd[];
 extern void dtv_himem_emd[];
 extern void c64_hitjoy_joy[];
 extern void c64_numpad_joy[];

include/cx16.h

@@ -285,11 +285,11 @@ struct __vera {
 
 /* Audio chip */
 struct __ym2151 {
+    unsigned char       reg;            /* Register number for data */
     union {
-        unsigned char   reg;            /* Register number for data */
+        unsigned char   data;
         unsigned char   status;         /* Busy flag */
     };
-    unsigned char       data;
 };
 #define YM2151  (*(volatile struct __ym2151 *)0x9F40)
 

include/lynx.h

@@ -83,7 +83,6 @@
 #define TGI_COLOR_YELLOW        COLOR_YELLOW
 #define TGI_COLOR_LIGHTGREEN    COLOR_LIGHTGREEN
 #define TGI_COLOR_GREEN         COLOR_GREEN
-#define TGI_COLOR_DARKBROWN     COLOR_DARKBROWN
 #define TGI_COLOR_PURPLE        COLOR_PURPLE
 #define TGI_COLOR_BLUE          COLOR_BLUE
 #define TGI_COLOR_LIGHTBLUE     COLOR_LIGHTBLUE

include/serial.h

@@ -148,7 +148,7 @@ unsigned char __fastcall__ ser_open (const struct ser_params* params);
 /* "Open" the port by setting the port parameters and enable interrupts. */
 
 unsigned char ser_close (void);
-/* "Close" the port. Clear buffers and and disable interrupts. */
+/* "Close" the port. Clear buffers and disable interrupts. */
 
 unsigned char __fastcall__ ser_get (char* b);
 /* Get a character from the serial port. If no characters are available, the
@@ -171,6 +171,3 @@ unsigned char __fastcall__ ser_ioctl (unsigned char code, void* data);
 
 /* End of serial.h */
 #endif
-
-
-

include/stddef.h

@@ -54,7 +54,7 @@ typedef unsigned size_t;
 
 /* NULL pointer */
 #ifndef _HAVE_NULL
-#define NULL    0
+#define NULL    ((void *) 0)
 #define _HAVE_NULL
 #endif
 

libsrc/apple2/ser/a2.ssc.s

@@ -57,7 +57,9 @@
 ;----------------------------------------------------------------------------
 ; I/O definitions
 
-ACIA            = $C088
+Offset          = $8F           ; Move 6502 false read out of I/O to page $BF
+
+ACIA            = $C088-Offset
 ACIA_DATA       = ACIA+0        ; Data register
 ACIA_STATUS     = ACIA+1        ; Status register
 ACIA_CMD        = ACIA+2        ; Command register
@@ -197,6 +199,7 @@ SER_OPEN:
         asl
         asl
         asl
+        adc     Offset                  ; Assume carry to be clear
         tax
 
         ; Check if the handshake setting is valid