6502/cc65
1
0
Fork 0
mirror of https://github.com/cc65/cc65.git synced 2025-08-05 01:25:44 +00:00
Code Issues Projects Releases Wiki Activity

Fix an error that was introduced by me in a4a24280f2:

Browse Source 
Using a pipe causes a subshell to be generated so the "exit" statements will
just leave the subshell. As a consequence, the sortedxxx.sh scripts produced
output but no error exit code. Which in turn caused an error in #2778 to slip
through undetected.
This commit is contained in:
Kugel Fuhr
2025-07-13 17:56:31 +02:00
parent faecedb514
commit c7096ab6d7
4 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,8 @@ function checkarray_quoted_name
}
find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
FILES=$(find "$CHECK_DIR" -name \*.\[ch\] -print)
for N in $FILES; do
grep -q "BEGIN SORTED.SH" "$N" && checkarray_quoted_name "$N"
done
exit 0

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

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

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

@@ -34,7 +34,8 @@ function checkarray_quoted_name
rm -rf .a.tmp
}
find "$CHECK_DIR" -name \*.\[ch\] -print | while read N; do
FILES=$(find "$CHECK_DIR" -name \*.\[ch\] -print)
for N in $FILES; do
grep -q "BEGIN SORTED_OPCODES.SH" "$N" && checkarray_quoted_name "$N"
done
exit 0

7
src/cc65/codeopt.c
View File

@@ -107,14 +107,14 @@ struct OptFunc {
static OptFunc DOpt65C02BitOps = { Opt65C02BitOps, "Opt65C02BitOps", 66, 0, 0, 0, 0, 0 };
static OptFunc DOpt65C02Ind = { Opt65C02Ind, "Opt65C02Ind", 100, 0, 0, 0, 0, 0 };
static OptFunc DOpt65C02Stores = { Opt65C02Stores, "Opt65C02Stores", 100, 0, 0, 0, 0, 0 };
static OptFunc DOptAXLoad = { OptAXLoad, "OptAXLoad", 50, 0, 0, 0, 0, 0 };
static OptFunc DOptAXOps = { OptAXOps, "OptAXOps", 50, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd1 = { OptAdd1, "OptAdd1", 125, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd2 = { OptAdd2, "OptAdd2", 200, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd3 = { OptAdd3, "OptAdd3", 65, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd4 = { OptAdd4, "OptAdd4", 90, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd5 = { OptAdd5, "OptAdd5", 100, 0, 0, 0, 0, 0 };
static OptFunc DOptAdd6 = { OptAdd6, "OptAdd6", 40, 0, 0, 0, 0, 0 };
static OptFunc DOptAXLoad = { OptAXLoad, "OptAXLoad", 50, 0, 0, 0, 0, 0 };
static OptFunc DOptAXOps = { OptAXOps, "OptAXOps", 50, 0, 0, 0, 0, 0 };
static OptFunc DOptBNegA1 = { OptBNegA1, "OptBNegA1", 100, 0, 0, 0, 0, 0 };
static OptFunc DOptBNegA2 = { OptBNegA2, "OptBNegA2", 100, 0, 0, 0, 0, 0 };
static OptFunc DOptBNegAX1 = { OptBNegAX1, "OptBNegAX1", 100, 0, 0, 0, 0, 0 };
@@ -232,13 +232,14 @@ static OptFunc* OptFuncs[] = {
&DOpt65C02BitOps,
&DOpt65C02Ind,
&DOpt65C02Stores,
&DOptAXLoad,
&DOptAXOps,
&DOptAdd1,
&DOptAdd2,
&DOptAdd3,
&DOptAdd4,
&DOptAdd5,
&DOptAdd6,
&DOptAXOps,
&DOptBNegA1,
&DOptBNegA2,
&DOptBNegAX1,