Skip to content

Commit aead0e6

Browse files
dreamer-codingdreamer-coding
authored
Merge branch 'fossillogic:main' into conan_package
2 parents d108742 + 317e23d commit aead0e6

File tree

11 files changed

+678
-479
lines changed

11 files changed

+678
-479
lines changed

‎.github/ciimage/Dockerfile.alpine‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Use a specific Alpine base image
2+
FROM alpine:3.21
3+
4+
# Set environment variables to avoid interaction
5+
ENV TZ=UTC \
6+
CC=clang \
7+
CXX=clang++ \
8+
LD_LIBRARY_PATH=/usr/local/lib
9+
10+
# Install system dependencies
11+
RUN apk add --no-cache \
12+
bash \
13+
build-base \
14+
clang \
15+
gdb \
16+
llvm \
17+
libstdc++ \
18+
python3 \
19+
py3-pip \
20+
git \
21+
wget \
22+
ca-certificates \
23+
tzdata \
24+
&& python3 -m ensurepip \
25+
&& pip3 install --no-cache-dir --upgrade pip \
26+
&& pip3 install --no-cache-dir meson==1.3.0 ninja==1.10.2
27+
28+
# Set working directory
29+
WORKDIR /workspace
30+
31+
# Default command
32+
CMD ["bash"]

‎.github/ciimage/Dockerfile.opensuse‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Use a specific openSUSE base image
2+
FROM opensuse/leap:15.5
3+
4+
# Set environment variables to avoid interaction
5+
ENV TZ=UTC \
6+
CC=clang \
7+
CXX=clang++ \
8+
LD_LIBRARY_PATH=/usr/local/lib \
9+
ZYPPER_ASSUME_YES=1 \
10+
DEBIAN_FRONTEND=noninteractive
11+
12+
# Install system dependencies
13+
RUN zypper refresh && \
14+
zypper install -y \
15+
bash \
16+
gcc \
17+
gcc-c++ \
18+
clang \
19+
gdb \
20+
llvm \
21+
libstdc++-devel \
22+
python3 \
23+
python3-pip \
24+
git \
25+
wget \
26+
ca-certificates \
27+
&& zypper clean --all
28+
29+
# Upgrade pip and install Meson + Ninja
30+
RUN python3 -m ensurepip && \
31+
python3 -m pip install --no-cache-dir --upgrade pip && \
32+
python3 -m pip install --no-cache-dir meson==1.3.0 ninja==1.10.2
33+
34+
# Set working directory
35+
WORKDIR /workspace
36+
37+
# Default command
38+
CMD ["bash"]

‎.github/workflows/crossfile_ci.yml‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
name: Crossfile CI
2+
3+
on:
4+
push:
5+
paths:
6+
- "**.c"
7+
- "**.h"
8+
- "**.py"
9+
- "**.build"
10+
- "**.options"
11+
pull_request:
12+
paths:
13+
- "**.c"
14+
- "**.h"
15+
- "**.py"
16+
- "**.build"
17+
- "**.options"
18+
19+
jobs:
20+
build_cross:
21+
name: Building on Bedrock ${{ matrix.architecture }}
22+
runs-on: ubuntu-latest # Using Ubuntu as the base system for cross-compilation
23+
24+
strategy:
25+
matrix:
26+
architecture: [arm, arm64, mips, mipsel, riscv64, ppc, ppc64le, sparc64, s390x]
27+
28+
steps:
29+
- name: Checkout code
30+
uses: actions/checkout@v4
31+
with:
32+
fetch-depth: 0
33+
34+
- name: Set up Python
35+
uses: actions/setup-python@v5
36+
with:
37+
python-version: '3.12'
38+
39+
- name: Install Cross-Compilation Toolchain
40+
run: |
41+
sudo apt update
42+
if [ "${{ matrix.architecture }}" == "arm" ]; then
43+
sudo apt install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
44+
elif [ "${{ matrix.architecture }}" == "arm64" ]; then
45+
sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
46+
elif [ "${{ matrix.architecture }}" == "mips" ]; then
47+
sudo apt install -y gcc-mips-linux-gnu g++-mips-linux-gnu
48+
elif [ "${{ matrix.architecture }}" == "mipsel" ]; then
49+
sudo apt install -y gcc-mipsel-linux-gnu g++-mipsel-linux-gnu
50+
elif [ "${{ matrix.architecture }}" == "riscv64" ]; then
51+
sudo apt install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu
52+
elif [ "${{ matrix.architecture }}" == "ppc" ]; then
53+
sudo apt install -y gcc-powerpc-linux-gnu g++-powerpc-linux-gnu
54+
elif [ "${{ matrix.architecture }}" == "ppc64le" ]; then
55+
sudo apt install -y gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu
56+
elif [ "${{ matrix.architecture }}" == "sparc64" ]; then
57+
sudo apt install -y gcc-sparc64-linux-gnu g++-sparc64-linux-gnu
58+
elif [ "${{ matrix.architecture }}" == "s390x" ]; then
59+
sudo apt install -y gcc-s390x-linux-gnu g++-s390x-linux-gnu
60+
fi
61+
62+
- name: Set Cross-Compilation Environment Variables
63+
run: |
64+
if [ "${{ matrix.architecture }}" == "arm" ]; then
65+
echo "CC=arm-linux-gnueabi-gcc" >> $GITHUB_ENV
66+
echo "CXX=arm-linux-gnueabi-g++" >> $GITHUB_ENV
67+
echo "CROSS_FILE=.github/crossfiles/arm.txt" >> $GITHUB_ENV
68+
elif [ "${{ matrix.architecture }}" == "arm64" ]; then
69+
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
70+
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
71+
echo "CROSS_FILE=.github/crossfiles/arm64.txt" >> $GITHUB_ENV
72+
elif [ "${{ matrix.architecture }}" == "mips" ]; then
73+
echo "CC=mips-linux-gnu-gcc" >> $GITHUB_ENV
74+
echo "CXX=mips-linux-gnu-g++" >> $GITHUB_ENV
75+
echo "CROSS_FILE=.github/crossfiles/mips.txt" >> $GITHUB_ENV
76+
elif [ "${{ matrix.architecture }}" == "mipsel" ]; then
77+
echo "CC=mipsel-linux-gnu-gcc" >> $GITHUB_ENV
78+
echo "CXX=mipsel-linux-gnu-g++" >> $GITHUB_ENV
79+
echo "CROSS_FILE=.github/crossfiles/mipsel.txt" >> $GITHUB_ENV
80+
elif [ "${{ matrix.architecture }}" == "riscv64" ]; then
81+
echo "CC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
82+
echo "CXX=riscv64-linux-gnu-g++" >> $GITHUB_ENV
83+
echo "CROSS_FILE=.github/crossfiles/riscv64.txt" >> $GITHUB_ENV
84+
elif [ "${{ matrix.architecture }}" == "ppc" ]; then
85+
echo "CC=powerpc-linux-gnu-gcc" >> $GITHUB_ENV
86+
echo "CXX=powerpc-linux-gnu-g++" >> $GITHUB_ENV
87+
echo "CROSS_FILE=.github/crossfiles/ppc.txt" >> $GITHUB_ENV
88+
elif [ "${{ matrix.architecture }}" == "ppc64le" ]; then
89+
echo "CC=powerpc64le-linux-gnu-gcc" >> $GITHUB_ENV
90+
echo "CXX=powerpc64le-linux-gnu-g++" >> $GITHUB_ENV
91+
echo "CROSS_FILE=.github/crossfiles/ppc64le.txt" >> $GITHUB_ENV
92+
elif [ "${{ matrix.architecture }}" == "sparc64" ]; then
93+
echo "CC=sparc64-linux-gnu-gcc" >> $GITHUB_ENV
94+
echo "CXX=sparc64-linux-gnu-g++" >> $GITHUB_ENV
95+
echo "CROSS_FILE=.github/crossfiles/sparc64.txt" >> $GITHUB_ENV
96+
elif [ "${{ matrix.architecture }}" == "s390x" ]; then
97+
echo "CC=s390x-linux-gnu-gcc" >> $GITHUB_ENV
98+
echo "CXX=s390x-linux-gnu-g++" >> $GITHUB_ENV
99+
echo "CROSS_FILE=.github/crossfiles/s390x.txt" >> $GITHUB_ENV
100+
fi
101+
102+
- name: Install Meson
103+
run: |
104+
python -m pip install meson ninja
105+
106+
- name: Configure the Project
107+
run: |
108+
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3 --cross-file $CROSS_FILE
109+
110+
- name: Build the Project
111+
run: |
112+
meson compile -C builddir
113+
114+
- name: Test the Project
115+
run: |
116+
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'

‎.github/workflows/meson_ci.yml‎

Lines changed: 3 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: macos-latest
6565
strategy:
6666
matrix:
67-
xcode_version: ["15.2", "15.3"]
67+
xcode_version: ["16.0", "16.1", "16.2", "16.3", "16.4"]
6868
steps:
6969
- name: Checkout code
7070
uses: actions/checkout@v4
@@ -84,7 +84,7 @@ jobs:
8484
python -m pip install meson ninja
8585
8686
- name: Configure
87-
run: meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
87+
run: meson setup builddir -Dwith_test=enabled -Dwarning_level=3
8888

8989
- name: Run Tests
9090
run: meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
@@ -173,7 +173,7 @@ jobs:
173173

174174
strategy:
175175
matrix:
176-
distro: [ubuntu, fedora, archlinux, debian]
176+
distro: [ubuntu, fedora, archlinux, debian] # in a new experiment add alpine and opensuse
177177

178178
steps:
179179
- name: Checkout code
@@ -208,102 +208,3 @@ jobs:
208208
sudo apt update
209209
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3
210210
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'"
211-
212-
build_cross:
213-
name: Building on Bedrock ${{ matrix.architecture }}
214-
runs-on: ubuntu-latest # Using Ubuntu as the base system for cross-compilation
215-
216-
strategy:
217-
matrix:
218-
architecture: [arm, arm64, mips, mipsel, riscv64, ppc, ppc64le, sparc64, s390x]
219-
220-
steps:
221-
- name: Checkout code
222-
uses: actions/checkout@v4
223-
with:
224-
fetch-depth: 0
225-
226-
- name: Set up Python
227-
uses: actions/setup-python@v5
228-
with:
229-
python-version: '3.12'
230-
231-
- name: Install Cross-Compilation Toolchain
232-
run: |
233-
sudo apt update
234-
if [ "${{ matrix.architecture }}" == "arm" ]; then
235-
sudo apt install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
236-
elif [ "${{ matrix.architecture }}" == "arm64" ]; then
237-
sudo apt install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
238-
elif [ "${{ matrix.architecture }}" == "mips" ]; then
239-
sudo apt install -y gcc-mips-linux-gnu g++-mips-linux-gnu
240-
elif [ "${{ matrix.architecture }}" == "mipsel" ]; then
241-
sudo apt install -y gcc-mipsel-linux-gnu g++-mipsel-linux-gnu
242-
elif [ "${{ matrix.architecture }}" == "riscv64" ]; then
243-
sudo apt install -y gcc-riscv64-linux-gnu g++-riscv64-linux-gnu
244-
elif [ "${{ matrix.architecture }}" == "ppc" ]; then
245-
sudo apt install -y gcc-powerpc-linux-gnu g++-powerpc-linux-gnu
246-
elif [ "${{ matrix.architecture }}" == "ppc64le" ]; then
247-
sudo apt install -y gcc-powerpc64le-linux-gnu g++-powerpc64le-linux-gnu
248-
elif [ "${{ matrix.architecture }}" == "sparc64" ]; then
249-
sudo apt install -y gcc-sparc64-linux-gnu g++-sparc64-linux-gnu
250-
elif [ "${{ matrix.architecture }}" == "s390x" ]; then
251-
sudo apt install -y gcc-s390x-linux-gnu g++-s390x-linux-gnu
252-
fi
253-
254-
- name: Set Cross-Compilation Environment Variables
255-
run: |
256-
if [ "${{ matrix.architecture }}" == "arm" ]; then
257-
echo "CC=arm-linux-gnueabi-gcc" >> $GITHUB_ENV
258-
echo "CXX=arm-linux-gnueabi-g++" >> $GITHUB_ENV
259-
echo "CROSS_FILE=.github/crossfiles/arm.txt" >> $GITHUB_ENV
260-
elif [ "${{ matrix.architecture }}" == "arm64" ]; then
261-
echo "CC=aarch64-linux-gnu-gcc" >> $GITHUB_ENV
262-
echo "CXX=aarch64-linux-gnu-g++" >> $GITHUB_ENV
263-
echo "CROSS_FILE=.github/crossfiles/arm64.txt" >> $GITHUB_ENV
264-
elif [ "${{ matrix.architecture }}" == "mips" ]; then
265-
echo "CC=mips-linux-gnu-gcc" >> $GITHUB_ENV
266-
echo "CXX=mips-linux-gnu-g++" >> $GITHUB_ENV
267-
echo "CROSS_FILE=.github/crossfiles/mips.txt" >> $GITHUB_ENV
268-
elif [ "${{ matrix.architecture }}" == "mipsel" ]; then
269-
echo "CC=mipsel-linux-gnu-gcc" >> $GITHUB_ENV
270-
echo "CXX=mipsel-linux-gnu-g++" >> $GITHUB_ENV
271-
echo "CROSS_FILE=.github/crossfiles/mipsel.txt" >> $GITHUB_ENV
272-
elif [ "${{ matrix.architecture }}" == "riscv64" ]; then
273-
echo "CC=riscv64-linux-gnu-gcc" >> $GITHUB_ENV
274-
echo "CXX=riscv64-linux-gnu-g++" >> $GITHUB_ENV
275-
echo "CROSS_FILE=.github/crossfiles/riscv64.txt" >> $GITHUB_ENV
276-
elif [ "${{ matrix.architecture }}" == "ppc" ]; then
277-
echo "CC=powerpc-linux-gnu-gcc" >> $GITHUB_ENV
278-
echo "CXX=powerpc-linux-gnu-g++" >> $GITHUB_ENV
279-
echo "CROSS_FILE=.github/crossfiles/ppc.txt" >> $GITHUB_ENV
280-
elif [ "${{ matrix.architecture }}" == "ppc64le" ]; then
281-
echo "CC=powerpc64le-linux-gnu-gcc" >> $GITHUB_ENV
282-
echo "CXX=powerpc64le-linux-gnu-g++" >> $GITHUB_ENV
283-
echo "CROSS_FILE=.github/crossfiles/ppc64le.txt" >> $GITHUB_ENV
284-
elif [ "${{ matrix.architecture }}" == "sparc64" ]; then
285-
echo "CC=sparc64-linux-gnu-gcc" >> $GITHUB_ENV
286-
echo "CXX=sparc64-linux-gnu-g++" >> $GITHUB_ENV
287-
echo "CROSS_FILE=.github/crossfiles/sparc64.txt" >> $GITHUB_ENV
288-
elif [ "${{ matrix.architecture }}" == "s390x" ]; then
289-
echo "CC=s390x-linux-gnu-gcc" >> $GITHUB_ENV
290-
echo "CXX=s390x-linux-gnu-g++" >> $GITHUB_ENV
291-
echo "CROSS_FILE=.github/crossfiles/s390x.txt" >> $GITHUB_ENV
292-
fi
293-
294-
- name: Install Meson
295-
run: |
296-
python -m pip install meson ninja
297-
298-
- name: Configure the Project
299-
run: |
300-
meson setup builddir --fatal-meson-warnings -Dwerror=true -Dwith_test=enabled -Dwarning_level=3 --cross-file $CROSS_FILE
301-
302-
- name: Build the Project
303-
run: |
304-
meson compile -C builddir
305-
306-
- name: Test the Project
307-
run: |
308-
meson test -C builddir -v --test-args='show --mode tree --verbose ci --result fail'
309-

‎code/logic/common.c‎

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,29 +1446,38 @@ pizza_sys_memory_t pizza_sys_memory_move(pizza_sys_memory_t dest, const pizza_sy
14461446
}
14471447

14481448
pizza_sys_memory_t pizza_sys_memory_resize(pizza_sys_memory_t ptr, size_t old_size, size_t new_size) {
1449-
if (ptr == null) {
1449+
if (!ptr) {
14501450
fprintf(stderr, "Error: pizza_sys_memory_resize() - Pointer is null.\n");
1451-
return null;
1451+
return NULL;
14521452
}
14531453

14541454
if (new_size == 0) {
14551455
pizza_sys_memory_free(ptr);
1456-
return null;
1456+
return NULL;
1457+
}
1458+
1459+
if (new_size <= old_size) {
1460+
// Shrinking, just realloc (no data copy needed)
1461+
pizza_sys_memory_t new_ptr = pizza_sys_memory_realloc(ptr, new_size);
1462+
if (!new_ptr) {
1463+
fprintf(stderr, "Error: pizza_sys_memory_resize() - Memory shrink failed, original preserved.\n");
1464+
return ptr;
1465+
}
1466+
return new_ptr;
14571467
}
14581468

1459-
// Allocate new memory
1460-
pizza_sys_memory_t new_ptr = pizza_sys_memory_realloc(ptr, new_size);
1469+
// Allocate new memory manually to preserve old data
1470+
pizza_sys_memory_t new_ptr = pizza_sys_memory_alloc(new_size);
14611471
if (!new_ptr) {
1462-
// Allocation failed; return the original memory block
1463-
fprintf(stderr, "Error: pizza_sys_memory_resize() - Memory resize failed, original memory preserved.\n");
1472+
fprintf(stderr, "Error: pizza_sys_memory_resize() - Allocation failed.\n");
14641473
return ptr;
14651474
}
14661475

1467-
// Check if new size is larger, and if so, preserve the old data
1468-
if (new_size > old_size && ptr) {
1469-
// Initialize new memory with old data (if necessary)
1470-
memcpy(new_ptr, ptr, old_size);
1471-
}
1476+
// Copy old data
1477+
memcpy(new_ptr, ptr, old_size);
1478+
1479+
// Free old memory
1480+
pizza_sys_memory_free(ptr);
14721481

14731482
return new_ptr;
14741483
}

‎code/logic/fossil/pizza/assume.h‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@
1717

1818
#include "framework.h"
1919

20-
#include <stdbool.h>
21-
#include <stdint.h>
22-
#include <stddef.h>
23-
#include <string.h>
24-
#include <float.h>
25-
#include <math.h>
26-
2720
#ifdef __cplusplus
2821
extern "C" {
2922
#endif

0 commit comments

Comments
 (0)