From 33ea94099ed7481b9ba8e062ebeb5634c0126da8 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Mon, 29 Jul 2024 07:57:46 +0800 Subject: [PATCH 1/5] Update bam to detect arm64 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 196f99525b..72d5d8a49f 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -122,7 +122,7 @@ jobs: uses: actions/checkout@v2 with: repository: matricks/bam - ref: 8cd08744c37666830d439ab54016c9d228c63b68 + ref: 657d1a0b47d1210b6d10bea12fdd28938f175d25 path: ./bam - name: Prepare Linux From bb7e9fd3b10a48fcfd57058433a4d3b5e24302fc Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Mon, 29 Jul 2024 08:03:20 +0800 Subject: [PATCH 2/5] List arm64 as supported architecture in bam.lua --- bam.lua | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/bam.lua b/bam.lua index 393612041f..886f279eff 100644 --- a/bam.lua +++ b/bam.lua @@ -121,8 +121,11 @@ function GenerateMacOSSettings(settings, conf, arch, compiler) elseif arch == "ppc64" then settings.cc.flags:Add("-arch ppc64") settings.link.flags:Add("-arch ppc64") + elseif arch == "arm64" then + settings.cc.flags:Add("-arch arm64") + settings.link.flags:Add("-arch arm64") else - print("Unknown Architecture '" .. arch .. "'. Supported: x86, x86_64, ppc, ppc64") + print("Unknown Architecture '" .. arch .. "'. Supported: x86, x86_64, ppc, ppc64, arm64") os.exit(1) end @@ -185,8 +188,10 @@ function GenerateLinuxSettings(settings, conf, arch, compiler) settings.link.flags:Add("-m64") elseif arch == "armv7l" then -- arm 32 bit + elseif arch == "arm64" then + -- arm 64 bit else - print("Unknown Architecture '" .. arch .. "'. Supported: x86, x86_64") + print("Unknown Architecture '" .. arch .. "'. Supported: x86, x86_64, armv7l, arm64") os.exit(1) end settings.link.libs:Add("pthread") @@ -504,7 +509,7 @@ if ScriptArgs['arch'] then else if arch == "ia32" then archs = {"x86"} - elseif arch == "ia64" or arch == "amd64" or arch == "arm64" then + elseif arch == "ia64" or arch == "amd64" then archs = {"x86_64"} else archs = {arch} From 422e2cfe7c65b04e05fa99c408f936aae56df7de Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Mon, 29 Jul 2024 08:14:52 +0800 Subject: [PATCH 3/5] debug bam trap --- .github/workflows/build.yaml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 72d5d8a49f..c600536692 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -52,7 +52,7 @@ jobs: if: contains(matrix.os, 'macOS') run: | brew update || true - brew install pkg-config sdl2 python3 ninja || true + brew install pkg-config sdl2 python3 ninja gdb || true # --overwrite for: Target /usr/local/bin/2to3 already exists. brew link --overwrite python@3.12 brew upgrade freetype @@ -147,6 +147,12 @@ jobs: cd bam ./make_win64_msvc.bat + - name: Build in debug mode (macos gdb) + if: contains(matrix.os, 'macOS') + run: | + otool -L ./bam/bam + gdb -ex='set confirm off' -ex='set pagination off' -ex=run -ex=bt -ex=quit ./bam/bam conf=debug all + - name: Build in debug mode run: ./bam/bam conf=debug all - name: Test debug From 40bde67cde06822723acf8609cdac45f9a840d65 Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Mon, 29 Jul 2024 08:18:20 +0800 Subject: [PATCH 4/5] run with dtruss --- .github/workflows/build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index c600536692..f379af1576 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -151,7 +151,8 @@ jobs: if: contains(matrix.os, 'macOS') run: | otool -L ./bam/bam - gdb -ex='set confirm off' -ex='set pagination off' -ex=run -ex=bt -ex=quit ./bam/bam conf=debug all + sudo dtruss ./bam/bam conf=debug all + # gdb -ex='set confirm off' -ex='set pagination off' -ex=run -ex=bt -ex=quit ./bam/bam conf=debug all - name: Build in debug mode run: ./bam/bam conf=debug all From 317ba3c7a2d4e134aa1e7c86c27e9440e1738a9e Mon Sep 17 00:00:00 2001 From: ChillerDragon Date: Mon, 29 Jul 2024 08:19:38 +0800 Subject: [PATCH 5/5] install gdb --- .github/workflows/build.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index f379af1576..e45abf8242 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -57,6 +57,7 @@ jobs: brew link --overwrite python@3.12 brew upgrade freetype sudo rm -rf /Library/Developer/CommandLineTools + brew install gdb - name: Build in debug mode env: ${{ matrix.env }}