Rename compiler and development-tool submodules and commands · PascalPixel/alchemy@50a2f75 · GitHub
Skip to content

Commit 50a2f75

Browse files
committed
Rename compiler and development-tool submodules and commands
1 parent 3ed8b24 commit 50a2f75

36 files changed

Lines changed: 91 additions & 91 deletions

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 3 deletions

‎.github/workflows/progress.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ jobs:
2626
fetch-depth: 0
2727
persist-credentials: false
2828

29-
- name: Initialize Psynergy
30-
run: git submodule update --init psynergy
29+
- name: Initialize Alchemy Devtools
30+
run: git submodule update --init alchemy-devtools
3131

3232
- name: Check out the published progress
3333
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4.3.1
@@ -42,14 +42,14 @@ jobs:
4242
run: >-
4343
gh release download decomp-reports --dir measured --pattern "${GITHUB_SHA}.tsv" --pattern "${GITHUB_SHA}.pb"
4444
45-
- name: Build Psynergy
45+
- name: Build Alchemy Devtools
4646
run: |
4747
rustup toolchain install "$RUSTUP_TOOLCHAIN" --profile minimal
48-
cargo build --locked --release --manifest-path psynergy/Cargo.toml -p psynergy
48+
cargo build --locked --release --manifest-path alchemy-devtools/Cargo.toml -p alchemy-devtools
4949
5050
- name: Record the measurement and draw both figures
5151
run: >-
52-
psynergy/target/release/psynergy progress --publish "measured/${GITHUB_SHA}.tsv" progress
52+
alchemy-devtools/target/release/alchemy-devtools progress --publish "measured/${GITHUB_SHA}.tsv" progress
5353
5454
- name: Publish the progress branch
5555
working-directory: progress

‎.gitmodules‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
[submodule "agscc"]
2-
path = agscc
3-
url = https://github.com/PascalPixel/agscc.git
4-
[submodule "psynergy"]
5-
path = psynergy
6-
url = https://github.com/PascalPixel/psynergy.git
1+
[submodule "alchemy-gcc"]
2+
path = alchemy-gcc
3+
url = https://github.com/PascalPixel/alchemy-gcc.git
4+
[submodule "alchemy-devtools"]
5+
path = alchemy-devtools
6+
url = https://github.com/PascalPixel/alchemy-devtools.git

‎.hooks/pre-push‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/sh
22
# A push to main sends that commit's measurement (make land) for CI.
3-
exec psynergy/target/release/psynergy progress --pre-push "$2"
3+
exec alchemy-devtools/target/release/alchemy-devtools progress --pre-push "$2"

‎AGENTS.md‎

Lines changed: 16 additions & 16 deletions
Large diffs are not rendered by default.

‎INSTALL.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ brew install arm-none-eabi-binutils xz pkg-config libpng utf8proc
2626
```bash
2727
git clone https://github.com/PascalPixel/alchemy
2828
cd alchemy
29-
git submodule update --init --recursive agscc
29+
git submodule update --init --recursive alchemy-gcc
3030
make bootstrap
3131
make tbs-en
3232
```
@@ -52,7 +52,7 @@ Dump your own cartridge and put the file in `roms/` as `tla-en.gba` (or `tla-ja.
5252
## If something fails
5353

5454
- **`png.h`, `utf8proc.h` or `arm-none-eabi-as` not found:** one of the packages in step 1 is missing.
55-
- **`agscc` is empty:** rerun `git submodule update --init --recursive agscc`, then `make bootstrap`.
55+
- **`alchemy-gcc` is empty:** rerun `git submodule update --init --recursive alchemy-gcc`, then `make bootstrap`.
5656
- **Odd path errors:** clone into a folder whose path has no spaces.
5757

5858
`make help` lists every other command.

‎Makefile‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ help:
3030
'make compare-editions all twelve editions; ⚓️ needs your own ROMs in roms/' \
3131
'make modern the six ☀️ editions'\'' C through a current GCC (MODERN_CC)' \
3232
'make test test the C build tools' \
33-
'make psynergy build the optional reconstruction tools (requires Rust)' \
33+
'make devtools build the optional reconstruction tools (requires Rust)' \
3434
'make progress DONE code and data in each edition built' \
3535
'make land on main before committing: all twelve, the tests, the measurement'
3636

@@ -65,7 +65,7 @@ clean:
6565
# --- Tools ---------------------------------------------------------------
6666

6767
TOOLS := tools/out
68-
PSYNERGY := psynergy/target/release/psynergy
68+
DEVTOOLS := alchemy-devtools/target/release/alchemy-devtools
6969
COMPILER := tools/out/compilers
7070

7171
XGCC := $(COMPILER)/xgcc -B$(COMPILER)/
@@ -137,7 +137,7 @@ ROM_END_tla := 0x09000000
137137
INCLUDES := -Igames/$(GAME)/include \
138138
$(addprefix -Igames/$(GAME)/include/,battle field game graphics lib menu sound system)
139139

140-
# Game C (K1, K2): agscc's GCC of July 2000, one option set per game.
140+
# Game C (K1, K2): alchemy-gcc's GCC of July 2000, one option set per game.
141141
CFLAGS_tbs := -O2 -mthumb -mthumb-interwork -mcpu=arm7tdmi -nostdinc -fcall-used-r4
142142
CFLAGS_tla := -O2 -mthumb -mcpu=arm7tdmi -nostdinc -fcall-used-r4 \
143143
-mtune=arm9tdmi -mthumb-split-constants -mthumb-call-via-lr
@@ -313,12 +313,12 @@ endif
313313
ifndef EDITION
314314
# --- Toolchain (K1) --------------------------------------------------------
315315
# `make bootstrap` builds the pinned compilers from source into
316-
# tools/out/compilers, as pret installs agbcc: agscc's three C generators,
316+
# tools/out/compilers, as pret installs agbcc: alchemy-gcc's three C generators,
317317
# GAS 2.10 from GNU's archive (it assembles their output), and the eight
318-
# libgcc members the games link, from agscc's own sources.
318+
# libgcc members the games link, from alchemy-gcc's own sources.
319319

320320
TOOLCHAIN := tools/out/toolchain
321-
-include agscc/config/host.mk
321+
-include alchemy-gcc/config/host.mk
322322
SHA256 := $(shell command -v sha256sum >/dev/null 2>&1 && echo sha256sum || echo shasum -a 256)
323323
GAS_SHA256 := fd7d227c0dd15cf5448385e56b8ad8313cd491839834b57c0c086ac7b7819a15
324324
GAS_CFLAGS := -O2 -std=gnu89 -D_POSIX_C_SOURCE=200809L -DNSIG=32 -Wno-implicit-int \
@@ -329,13 +329,13 @@ bootstrap: tools compilers $(CCAS) $(LIBGCC)
329329
compilers: $(COMPILER)/xgcc
330330

331331
$(COMPILER)/xgcc:
332-
$(MAKE) -C agscc
333-
$(MAKE) -C agscc generated-check
334-
$(MAKE) -C agscc/arm probe
332+
$(MAKE) -C alchemy-gcc
333+
$(MAKE) -C alchemy-gcc generated-check
334+
$(MAKE) -C alchemy-gcc/arm probe
335335
@mkdir -p $(COMPILER)/agbcc
336-
cp agscc/build/gcc/xgcc agscc/build/gcc/cpp0 agscc/build/gcc/tradcpp0 agscc/build/gcc/cc1 $(COMPILER)/
337-
cp agscc/arm/build/gcc/cc1 $(COMPILER)/gcc2952_arm
338-
cp agscc/agbcc/gcc/old_agbcc $(COMPILER)/agbcc/old_agbcc
336+
cp alchemy-gcc/build/gcc/xgcc alchemy-gcc/build/gcc/cpp0 alchemy-gcc/build/gcc/tradcpp0 alchemy-gcc/build/gcc/cc1 $(COMPILER)/
337+
cp alchemy-gcc/arm/build/gcc/cc1 $(COMPILER)/gcc2952_arm
338+
cp alchemy-gcc/agbcc/gcc/old_agbcc $(COMPILER)/agbcc/old_agbcc
339339

340340
$(TOOLCHAIN)/binutils-2.10.tar.gz:
341341
@mkdir -p $(@D)
@@ -361,8 +361,8 @@ $(CCAS): $(TOOLCHAIN)/binutils-2.10.tar.gz
361361
LIBGCC_WORK := $(TOOLCHAIN)/libgcc
362362
LIBGCC_MEMBERS := _call_via_rX _addsub_df _si_to_df _df_to_si _pack_df _unpack_df _thenan_df _lshrdi3
363363
LIBGCC_CFLAGS := -O2 -mthumb -mcpu=arm7tdmi -nostdinc -DCROSS_COMPILE -DIN_GCC -DIN_LIBGCC2 \
364-
-D__GCC_FLOAT_NOT_NEEDED -Dinhibit_libc -fno-inline -isystem $(CURDIR)/agscc/gcc/ginclude
365-
LIBGCC_INCLUDES := -I$(CURDIR)/agscc/gcc -I$(CURDIR)/agscc/gcc/config -I$(CURDIR)/agscc/include
364+
-D__GCC_FLOAT_NOT_NEEDED -Dinhibit_libc -fno-inline -isystem $(CURDIR)/alchemy-gcc/gcc/ginclude
365+
LIBGCC_INCLUDES := -I$(CURDIR)/alchemy-gcc/gcc -I$(CURDIR)/alchemy-gcc/gcc/config -I$(CURDIR)/alchemy-gcc/include
366366
LIBGCC_CC := $(CURDIR)/$(COMPILER)/xgcc -B$(CURDIR)/$(COMPILER)/ $(LIBGCC_CFLAGS)
367367
LIBGCC_TOOLS := | $(COMPILER)/xgcc $(CCAS)
368368

@@ -371,12 +371,12 @@ $(LIBGCC): $(addprefix $(LIBGCC_WORK)/,$(addsuffix .o,$(LIBGCC_MEMBERS)))
371371
rm -f $@
372372
cd $(LIBGCC_WORK) && $(PREFIX)ar crsD $(CURDIR)/$@ $(notdir $^)
373373

374-
$(LIBGCC_WORK)/_call_via_rX.o: agscc/gcc/config/arm/lib1funcs.asm $(LIBGCC_TOOLS)
374+
$(LIBGCC_WORK)/_call_via_rX.o: alchemy-gcc/gcc/config/arm/lib1funcs.asm $(LIBGCC_TOOLS)
375375
@mkdir -p $(@D)
376376
cp $< $(@D)/lib1funcs.asm
377377
cd $(@D) && $(LIBGCC_CC) $(LIBGCC_INCLUDES) -DL_call_via_rX -xassembler-with-cpp lib1funcs.asm -c -o $(@F)
378378

379-
$(LIBGCC_WORK)/dp-bit.c: agscc/gcc/config/fp-bit.c
379+
$(LIBGCC_WORK)/dp-bit.c: alchemy-gcc/gcc/config/fp-bit.c
380380
@mkdir -p $(@D)
381381
printf '#ifndef __ARMEB__\n#define FLOAT_BIT_ORDER_MISMATCH\n#define FLOAT_WORD_ORDER_MISMATCH\n#endif\n' > $@
382382
cat $< >> $@
@@ -385,9 +385,9 @@ LIBGCC_DPBIT := _addsub_df _si_to_df _df_to_si _pack_df _unpack_df _thenan_df
385385
$(addprefix $(LIBGCC_WORK)/,$(addsuffix .o,$(LIBGCC_DPBIT))): $(LIBGCC_WORK)/%.o: $(LIBGCC_WORK)/dp-bit.c $(LIBGCC_TOOLS)
386386
cd $(@D) && $(LIBGCC_CC) $(LIBGCC_INCLUDES) -DFINE_GRAINED_LIBRARIES -DL$* $(CURDIR)/$< -c -o $(@F)
387387

388-
$(LIBGCC_WORK)/_lshrdi3.o: agscc/gcc/libgcc2.c $(LIBGCC_TOOLS)
388+
$(LIBGCC_WORK)/_lshrdi3.o: alchemy-gcc/gcc/libgcc2.c $(LIBGCC_TOOLS)
389389
@mkdir -p $(@D)
390-
cp agscc/config/arm/tconfig.h agscc/config/arm/tm.h $(@D)/
390+
cp alchemy-gcc/config/arm/tconfig.h alchemy-gcc/config/arm/tm.h $(@D)/
391391
cd $(@D) && $(LIBGCC_CC) -I. $(LIBGCC_INCLUDES) -DL_lshrdi3 $(CURDIR)/$< -c -o $(@F)
392392

393393
# --- Tools and tests -------------------------------------------------------
@@ -416,19 +416,19 @@ format-check:
416416

417417
# Reconstruction work is optional. Normal builds use only the C tools above.
418418
CARGO ?= cargo
419-
.PHONY: psynergy test-psynergy progress land
420-
psynergy:
421-
@test -f psynergy/Cargo.toml || { echo 'Initialize Psynergy with: git submodule update --init psynergy' >&2; exit 1; }
422-
$(CARGO) build --locked --release --manifest-path psynergy/Cargo.toml -p psynergy
419+
.PHONY: devtools test-devtools progress land
420+
devtools:
421+
@test -f alchemy-devtools/Cargo.toml || { echo 'Initialize Alchemy Devtools with: git submodule update --init alchemy-devtools' >&2; exit 1; }
422+
$(CARGO) build --locked --release --manifest-path alchemy-devtools/Cargo.toml -p alchemy-devtools
423423

424-
test-psynergy: psynergy
425-
ALCHEMY_ROOT=$(CURDIR) $(CARGO) test --locked --release --workspace --manifest-path psynergy/Cargo.toml
424+
test-devtools: devtools
425+
ALCHEMY_ROOT=$(CURDIR) $(CARGO) test --locked --release --workspace --manifest-path alchemy-devtools/Cargo.toml
426426

427-
progress: psynergy
428-
$(PSYNERGY) progress
427+
progress: devtools
428+
$(DEVTOOLS) progress
429429

430430
# Before landing on main: all twelve editions, both test suites, then the
431431
# measurement the pre-push hook sends for CI (C3).
432-
land: compare-editions test test-psynergy
433-
$(PSYNERGY) progress
432+
land: compare-editions test test-devtools
433+
$(DEVTOOLS) progress
434434
endif

‎README.md‎

Lines changed: 2 additions & 2 deletions

‎agscc‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎alchemy-devtools‎

Submodule alchemy-devtools added at c043044

0 commit comments

Comments
 (0)