the10thwiz/cc65
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into mega65c

Browse Source
This commit is contained in:
mrdudz
2025-06-26 01:52:10 +02:00
parent 1b815d4148 3a6766d0a0
commit 01ba0b562d
33 changed files with 182 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.github/checks/lastline.sh vendored
View File

@@ -23,3 +23,4 @@ if [ x"$FILES"x != xx ]; then
done
exit -1
fi
exit 0

1
.github/checks/lineendings.sh vendored
View File

@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
done
exit -1
fi
exit 0

1
.github/checks/noexec.sh vendored
View File

@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
done
exit -1
fi
exit 0

1
.github/checks/sorted.sh vendored
View File

@@ -36,3 +36,4 @@ function checkarray_quoted_name
for N in `grep -rl "BEGIN SORTED.SH" "$CHECK_DIR"`; do
checkarray_quoted_name $N
done
exit 0

5
.github/checks/sorted_codeopt.sh vendored
View File

@@ -63,6 +63,7 @@ function checkarray
}
for N in `grep -rl "BEGIN DECL SORTED_CODEOPT.SH" "$CHECK_DIR"`; do
checkarray $N
find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
grep -q "BEGIN DECL SORTED_CODEOPT.SH" "$N" && checkarray $N
done
exit 0

2
.github/checks/sorted_opcodes.sh vendored
View File

@@ -37,4 +37,4 @@ function checkarray_quoted_name
for N in `grep -rl "BEGIN SORTED_OPCODES.SH" "$CHECK_DIR"`; do
checkarray_quoted_name $N
done
exit 0

1
.github/checks/spaces.sh vendored
View File

@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
done
exit -1
fi
exit 0

1
.github/checks/tabs.sh vendored
View File

@@ -16,3 +16,4 @@ if [ x"$FILES"x != xx ]; then
done
exit -1
fi
exit 0

37
libsrc/agat/sysuname.s Normal file
View File

@@ -0,0 +1,37 @@
;
; Ullrich von Bassewitz, 2003-08-12
;
; unsigned char __fastcall__ _sysuname (struct utsname* buf);
;
.export __sysuname, utsdata
.import utscopy
__sysuname = utscopy
;--------------------------------------------------------------------------
; Data. We define a fixed utsname struct here and just copy it.
.rodata
utsdata:
; sysname
.asciiz "cc65"
; nodename
.asciiz ""
; release
.byte .string (>.version)
.byte '.'
.byte .string (<.version)
.byte $00
; version
.byte '0' ; unused
.byte $00
; machine
.asciiz "Agat"

6
libsrc/apple2/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/atari/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/atari5200/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

16
libsrc/atmos/sysuname.s
View File

@@ -23,23 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.if ((.VERSION >> 4) & $0F) > 9
.byte ((.VERSION >> 4) & $0F) / 10 + '0'
.byte ((.VERSION >> 4) & $0F) .MOD 10 + '0'
.else
.byte ((.VERSION >> 4) & $0F) + '0'
.endif
.byte .string (<.version)
.byte $00
; version
.if (.VERSION & $0F) > 9
.byte (.VERSION & $0F) / 10 + '0'
.byte (.VERSION & $0F) .MOD 10 + '0'
.else
.byte (.VERSION & $0F) + '0'
.endif
.byte '0' ; unused
.byte $00
; machine

6
libsrc/c128/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/c16/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/c64/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/cbm510/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/cbm610/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/creativision/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/cx16/sysuname.s
View File

@@ -24,13 +24,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/geos-common/system/sysuname.s
View File

@@ -22,13 +22,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/lynx/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/nes/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/pet/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

6
libsrc/plus4/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

16
libsrc/telestrat/sysuname.s
View File

@@ -23,23 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.if ((.VERSION >> 4) & $0F) > 9
.byte ((.VERSION >> 4) & $0F) / 10 + '0'
.byte ((.VERSION >> 4) & $0F) .MOD 10 + '0'
.else
.byte ((.VERSION >> 4) & $0F) + '0'
.endif
.byte .string (<.version)
.byte $00
; version
.if (.VERSION & $0F) > 9
.byte (.VERSION & $0F) / 10 + '0'
.byte (.VERSION & $0F) .MOD 10 + '0'
.else
.byte (.VERSION & $0F) + '0'
.endif
.byte '0' ; unused
.byte $00
; machine

6
libsrc/vic20/sysuname.s
View File

@@ -23,13 +23,13 @@ utsdata:
.asciiz ""
; release
.byte ((.VERSION >> 8) & $0F) + '0'
.byte .string (>.version)
.byte '.'
.byte ((.VERSION >> 4) & $0F) + '0'
.byte .string (<.version)
.byte $00
; version
.byte (.VERSION & $0F) + '0'
.byte '0' ; unused
.byte $00
; machine

12
samples/Makefile
View File

@@ -322,8 +322,7 @@ EXELIST_gamate = \
hello
EXELIST_geos-cbm = \
ascii \
diodemo
ascii
EXELIST_geos-apple = \
ascii
@@ -382,6 +381,9 @@ EXELIST_sim6502 = \
EXELIST_sim65c02 = $(EXELIST_sim6502)
EXELIST_rp6502 = \
notavailable
EXELIST_supervision = \
notavailable
@@ -450,6 +452,7 @@ TARGETS := \
atarixl \
atari2600 \
atari5200 \
atari7800 \
atmos \
bbc \
c128 \
@@ -461,6 +464,8 @@ TARGETS := \
creativision \
cx16 \
gamate \
geos-apple \
geos-cbm \
kim1 \
lunix \
lynx \
@@ -470,6 +475,7 @@ TARGETS := \
pce \
pet \
plus4 \
rp6502 \
sim6502 \
sim65c02 \
supervision \
@@ -477,12 +483,14 @@ TARGETS := \
telestrat \
vic20
# --------------------------------------------------------------------------
# Rule to make the binaries for every platform
define TARGET_recipe
@echo making samples for: $(T)
@$(MAKE) --no-print-directory clean SYS:=$(T)
@$(MAKE) -j2 SYS:=$(T)
@$(MAKE) --no-print-directory clean SYS:=$(T)

12
samples/checkversion.c
View File

@@ -9,6 +9,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <sys/utsname.h>
#if ((__CC65__ >> 8) > 3) || ((__CC65__ & 0x000f) > 0)
/* compiler version is 2.19-git or higher */
@@ -29,6 +30,17 @@
int main(void)
{
#if !defined(__SIM6502__) && !defined(__SIM65C02__) && !defined(__AGAT__)
struct utsname buf;
uname (&buf);
printf("utsname.sysname: %s\n", buf.sysname);
printf("utsname.nodename: %s\n", buf.nodename);
printf("utsname.release: %s\n", buf.release);
printf("utsname.version: %s\n", buf.version);
printf("utsname.machine: %s\n", buf.machine);
#endif
printf("__CC65__ defined as %04x\n", __CC65__);
printf("compiler version is %u.%u\n", VER_MAJOR, VER_MINOR);
if (__CC65__ == VERSION) {

3
samples/tutorial/Makefile
View File

@@ -43,6 +43,9 @@ EXELIST_atari2600 = \
EXELIST_atari5200 = \
notavailable
EXELIST_atari7800 = \
notavailable
EXELIST_bbc = \
notavailable

3
src/cc65/codeopt.c
View File

@@ -133,6 +133,7 @@ static OptFunc DOptCmp2 = { OptCmp2, "OptCmp2", 85, 0,
static OptFunc DOptCmp3 = { OptCmp3, "OptCmp3", 75, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp4 = { OptCmp4, "OptCmp4", 75, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp5 = { OptCmp5, "OptCmp5", 100, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp6 = { OptCmp6, "OptCmp6", 33, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp7 = { OptCmp7, "OptCmp7", 85, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp8 = { OptCmp8, "OptCmp8", 50, 0, 0, 0, 0, 0 };
static OptFunc DOptCmp9 = { OptCmp9, "OptCmp9", 85, 0, 0, 0, 0, 0 };
@@ -255,6 +256,7 @@ static OptFunc* OptFuncs[] = {
&DOptCmp3,
&DOptCmp4,
&DOptCmp5,
&DOptCmp6,
&DOptCmp7,
&DOptCmp8,
&DOptCmp9,
@@ -729,6 +731,7 @@ static unsigned RunOptGroup3 (CodeSeg* S)
C += RunOptFunc (S, &DOptCondBranch3, 1);
C += RunOptFunc (S, &DOptCondBranchC, 1);
C += RunOptFunc (S, &DOptRTSJumps1, 1);
C += RunOptFunc (S, &DOptCmp6, 1); /* After OptRTSJumps1 */
C += RunOptFunc (S, &DOptBoolCmp, 1);
C += RunOptFunc (S, &DOptBoolTrans, 1);
C += RunOptFunc (S, &DOptBNegA2, 1); /* After OptCondBranch's */

45
src/cc65/coptcmp.c
View File

@@ -503,6 +503,51 @@ unsigned OptCmp5 (CodeSeg* S)
unsigned OptCmp6 (CodeSeg* S)
/* Remove compare instructions before an RTS or an subroutine call that doesn't
** use the flags.
*/
{
unsigned Changes = 0;
unsigned I;
/* Walk over the entries */
I = 0;
while (I < CS_GetEntryCount (S)) {
CodeEntry* N;
/* Get next entry */
CodeEntry* E = CS_GetEntry (S, I);
/* Check for a compare followed by something else.
** Note: The test could be improved by checking the flag usage of the
** function explicitly against the flags set by the compare instruction.
** For current code generation this makes no difference, however.
*/
if ((E->Info & OF_CMP) != 0 &&
(N = CS_GetNextEntry (S, I)) != 0 &&
(N->OPC == OP65_RTS || /* Either RTS, or ... */
(N->OPC == OP65_JSR && /* ... or JSR ... */
N->JumpTo == 0 && /* ... to external ... */
(N->Use & PSTATE_ALL) == 0 && /* ... with no flags used ... */
(N->Chg & PSTATE_ALL) == PSTATE_ALL))) { /* ... but all destroyed */
/* Found, remove the compare */
CS_DelEntry (S, I);
++Changes;
}
/* Next entry */
++I;
}
/* Return the number of changes made */
return Changes;
}
unsigned OptCmp7 (CodeSeg* S)
/* Search for a sequence ldx/txa/branch and remove the txa if A is not
** used later.

5
src/cc65/coptcmp.h
View File

@@ -123,6 +123,11 @@ unsigned OptCmp5 (CodeSeg* S);
** jne/jeq L2
*/
unsigned OptCmp6 (CodeSeg* S);
/* Remove compare instructions before an RTS or an exit by jumping to some
** other function.
*/
unsigned OptCmp7 (CodeSeg* S);
/* Search for a sequence ldx/txa/branch and remove the txa if A is not
** used later.