cracks/nzs: Fix for GCC14 and use m68k-elf- tool prefix

keirf · Jan 5, 2025 · 0b189c6 · 0b189c6
1 parent ea62d46
commit 0b189c6
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 71 deletions.
diff --git a/cracking/cracks/nzs/gnu_c/Rules.mk → cracking/cracks/nzs/Rules.mk b/cracking/cracks/nzs/gnu_c/Rules.mk → cracking/cracks/nzs/Rules.mk
@@ -1,4 +1,4 @@
-TOOL_PREFIX = m68k-unknown-elf-
+TOOL_PREFIX = m68k-elf-
 CC = $(TOOL_PREFIX)gcc
 OBJCOPY = $(TOOL_PREFIX)objcopy
 
@@ -10,7 +10,7 @@ FLAGS  = -Os -nostdlib -std=gnu99 -iquote inc
 FLAGS += -Wall -Werror -Wno-format -Wdeclaration-after-statement
 FLAGS += -Wstrict-prototypes -Wredundant-decls -Wnested-externs
 FLAGS += -fno-common -fno-exceptions -fno-strict-aliasing -fomit-frame-pointer
-FLAGS += -m68000 -msoft-float
+FLAGS += -fno-delete-null-pointer-checks -m68000 -msoft-float
 
 FLAGS += -MMD -MF .$(@F).d
 DEPS = .*.d

diff --git a/cracking/cracks/nzs/gnu/Makefile b/cracking/cracks/nzs/gnu/Makefile
@@ -1,3 +1,3 @@
-include Rules.mk
+include ../Rules.mk
 .PHONY: all
 all: nzs_bootblock.bin nzs.bin
diff --git a/cracking/cracks/nzs/gnu/Rules.mk b/cracking/cracks/nzs/gnu/Rules.mk
diff --git a/cracking/cracks/nzs/gnu_c/Makefile b/cracking/cracks/nzs/gnu_c/Makefile
@@ -2,7 +2,7 @@ OBJS += nzs_crack.o
 OBJS += trainer.o
 OBJS += util.o
 
-include Rules.mk
+include ../Rules.mk
 
 .PHONY: all
 all: nzs_bootblock.bin nzs.bin
diff --git a/cracking/cracks/nzs/gnu_c/amiga.ld b/cracking/cracks/nzs/gnu_c/amiga.ld
@@ -1,5 +1,11 @@
 ENTRY(start)
 
+PHDRS
+{
+  /* Define as RW^X to avoid a linker warning */
+  text PT_LOAD FLAGS(6);
+}
+
 SECTIONS
 {
   GRAPHICS = 0x20000;
@@ -15,7 +21,7 @@ SECTIONS
     *(.rodata*)
     . = ALIGN(4);
     _etext = .;
-  }
+  } :text
 
   .data : {
     . = ALIGN(4);
@@ -24,7 +30,7 @@ SECTIONS
     *(.data*)
     . = ALIGN(4);
     _edat = .;
-  }
+  } :text
 
   .bss : {
     . = ALIGN(4);
@@ -34,7 +40,7 @@ SECTIONS
     . = ALIGN(4);
     _ebss = .;
     _end = .;
-  }
+  } :text
 
   /DISCARD/ : {
     *(.eh_frame)

diff --git a/cracking/cracks/nzs/gnu_c/inc/decls.h b/cracking/cracks/nzs/gnu_c/inc/decls.h
@@ -16,6 +16,7 @@
 #include "types.h"
 #include "util.h"
 #include "amiga_hw.h"
+#include "../../../../../base/inc/m68k.h"
 
 /*
  * Local variables:

diff --git a/cracking/cracks/nzs/gnu_c/trainer.c b/cracking/cracks/nzs/gnu_c/trainer.c
@@ -9,6 +9,8 @@
  * See the file COPYING for more details, or visit <http://unlicense.org>.
  */
 
+static volatile struct m68k_vector_table * const m68k_vec =
+    (struct m68k_vector_table *)0x0;
 static volatile struct amiga_custom * const cust =
     (struct amiga_custom *)0xdff000;
 static volatile struct amiga_cia * const ciaa =
@@ -269,8 +271,8 @@ static void update_option(uint8_t nr)
     print_option(opt, nr);
 }
 
-IRQ(CIA_IRQ);
-static void c_CIA_IRQ(void)
+IRQ(CIAA_IRQ);
+static void c_CIAA_IRQ(void)
 {
     uint16_t i;
     uint8_t icr = ciaa->icr;
@@ -333,7 +335,7 @@ uint32_t trainer(void)
 
     unpack_font();
 
-    *(volatile void **)0x68 = CIA_IRQ;
+    m68k_vec->level2_autovector.p = CIAA_IRQ;
     cust->cop1lc.p = copper;
 
     print_screen();