aboutsummaryrefslogtreecommitdiff
path: root/devel/z80-asm/files
diff options
context:
space:
mode:
Diffstat (limited to 'devel/z80-asm/files')
-rw-r--r--devel/z80-asm/files/patch-Makefile43
-rw-r--r--devel/z80-asm/files/patch-hardware_Makefile29
-rw-r--r--devel/z80-asm/files/patch-memory.c38
-rw-r--r--devel/z80-asm/files/patch-z80-asm.c11
-rw-r--r--devel/z80-asm/files/patch-z80-mon.c11
5 files changed, 132 insertions, 0 deletions
diff --git a/devel/z80-asm/files/patch-Makefile b/devel/z80-asm/files/patch-Makefile
new file mode 100644
index 000000000000..e0da162815bd
--- /dev/null
+++ b/devel/z80-asm/files/patch-Makefile
@@ -0,0 +1,43 @@
+--- Makefile.orig 2006-10-04 15:26:50 UTC
++++ Makefile
+@@ -30,16 +30,17 @@ endif
+ MONI=z80-mon.exe
+ endif
+
+-CC= gcc
++CC?= gcc
+ CFLAGS=-O2 -Wall -D$(ZZ) -D$(SYSTEM) $(DEFINES) -W -Wstrict-prototypes \
+- -Wno-parentheses -fomit-frame-pointer -falign-functions=0
++ -Wno-self-assign -Wno-parentheses -fomit-frame-pointer -falign-functions=0
+ LDFLAGS=
+
+ all:
+ cd hardware; $(MAKE) SYSTEM=$(SYSTEM) DEFINES="-D$(ZZZ) -D$(SYSTEM) $(DEFINES)" hard.a
+- make $(ASM)
+- make $(MONI)
+- cd hardware; $(MAKE) SYSTEM=$(SYSTEM) DEFINES="-D$(ZZZ) -D$(SYSTEM) $(DEFINES)"
++ $(MAKE) $(ASM)
++ $(MAKE) $(MONI)
++ # Commenting out this line as binaries produced are not installed
++ # cd hardware; $(MAKE) SYSTEM=$(SYSTEM) DEFINES="-D$(ZZZ) -D$(SYSTEM) $(DEFINES)"
+
+ clean:
+ $(RM) *.o
+@@ -48,7 +49,7 @@ clean:
+ $(RM) asm.a
+ $(RM) cpu.a
+ $(RM) .bus_proto
+- cd hardware; make SYSTEM=$(SYSTEM) clean
++ cd hardware; $(MAKE) SYSTEM=$(SYSTEM) clean
+
+ install:
+ chmod a+rx $(ASM) $(MONI); cp -p $(ASM) $(MONI) $(BIN_DIR)
+@@ -118,6 +119,6 @@ $(ASM): z80-asm.o dummy.o asm.a $(HW)
+
+
+ $(ASM): z80-asm.o dummy.o asm.a $(HW)
+- gcc -lc -o $(ASM) z80-asm.o dummy.o asm.a $(HW)
++ $(CC) -lc -o $(ASM) z80-asm.o dummy.o asm.a $(HW)
+ $(MONI): z80-mon.o cpu.a console.o asm.a $(HW)
+- gcc -lc -o $(MONI) z80-mon.o cpu.a console.o asm.a $(HW)
++ $(CC) -lc -o $(MONI) z80-mon.o cpu.a console.o asm.a $(HW)
diff --git a/devel/z80-asm/files/patch-hardware_Makefile b/devel/z80-asm/files/patch-hardware_Makefile
new file mode 100644
index 000000000000..d44480119001
--- /dev/null
+++ b/devel/z80-asm/files/patch-hardware_Makefile
@@ -0,0 +1,29 @@
+--- hardware/Makefile.orig 2023-12-28 16:42:51 UTC
++++ hardware/Makefile
+@@ -16,7 +16,7 @@ endif
+ MON=monitor_cpu.exe
+ endif
+
+-CC= gcc
++CC?= gcc
+ CFLAGS=-O2 -Wall -D$(SYSTEM) $(DEFINES) -W -Wstrict-prototypes \
+ -Wno-parentheses -fomit-frame-pointer -falign-functions=0
+ LDFLAGS=
+@@ -59,12 +59,12 @@ $(LCD): lcd_display.o ../dummy.o ../cpu.a ../console.o
+ ssl_zds.o: ssl_zds.c ../z80-cpu.h ../z80-global zds_token
+
+ $(LCD): lcd_display.o ../dummy.o ../cpu.a ../console.o ../asm.a hard.a
+- gcc -lc -o $(LCD) lcd_display.o ../dummy.o ../cpu.a ../console.o ../asm.a hard.a
++ $(CC) -lc -o $(LCD) lcd_display.o ../dummy.o ../cpu.a ../console.o ../asm.a hard.a
+ $(CLK): hardware_clock.o
+- gcc -lc -o $(CLK) hardware_clock.o
++ $(CC) -lc -o $(CLK) hardware_clock.o
+ $(MKP): make_ports.o
+- gcc -lc -o $(MKP) make_ports.o
++ $(CC) -lc -o $(MKP) make_ports.o
+ $(IOP): port_io.o
+- gcc -lc -o $(IOP) port_io.o
++ $(CC) -lc -o $(IOP) port_io.o
+ $(MON): monitor_cpu.o ../cpu.a ../console.o ../asm.a
+- gcc -lc -o $(MON) monitor_cpu.o ../cpu.a ../console.o ../asm.a
++ $(CC) -lc -o $(MON) monitor_cpu.o ../cpu.a ../console.o ../asm.a
diff --git a/devel/z80-asm/files/patch-memory.c b/devel/z80-asm/files/patch-memory.c
new file mode 100644
index 000000000000..272441a039d6
--- /dev/null
+++ b/devel/z80-asm/files/patch-memory.c
@@ -0,0 +1,38 @@
+--- memory.c.orig 2024-04-25 09:31:04 UTC
++++ memory.c
+@@ -298,7 +298,7 @@ for (k=1; fgets(buffer,800,fp) ; k++)
+ continue;
+ }
+ else if (!(rom_fp = fopen(filename,"r")))
+- { char err_msg[64];
++ { char err_msg[256];
+ sprintf(err_line,ERROR_BANK,k);
+ sprintf(err_msg," can't open bank file %63s", filename);
+ error(0,err_line,err_msg);
+@@ -311,7 +311,7 @@ for (k=1; fgets(buffer,800,fp) ; k++)
+ }
+ if (rom_fp)
+ { if (1U<<log2 != fread(bank[id].back_up,1,1U<<log2,rom_fp))
+- { char err_msg[64];
++ { char err_msg[256];
+ sprintf(err_msg," insufficient rom %63s", filename);
+ sprintf(err_line,ERROR_BANK,k);
+ error(0,err_line," rom malfunction");
+@@ -402,7 +402,7 @@ for (k=1; fgets(buffer,800,fp) ; k++)
+ for (j=0;j<h;j++)
+ { id = strtoul(tok4+3*j,&p,16);
+ if (id >= 256 || (p && *p && *p != ',') || tok4[3*j]=='-' || tok4[3*j]=='+')
+- { char err_msg[32];
++ { char err_msg[256];
+ sprintf(err_line,ERROR_MAP,k);
+ sprintf(err_msg," invalid %u-th bank_id: %3s",j+1,tok4+3*j);
+ error(0,err_line,err_msg);
+@@ -414,7 +414,7 @@ for (k=1; fgets(buffer,800,fp) ; k++)
+ break;
+ }
+ if (!bank[id].type)
+- { char err_msg[32];
++ { char err_msg[256];
+ sprintf(err_line,ERROR_MAP,k);
+ sprintf(err_msg," bank_id %u not defined",id);
+ error(0,err_line,err_msg);
diff --git a/devel/z80-asm/files/patch-z80-asm.c b/devel/z80-asm/files/patch-z80-asm.c
new file mode 100644
index 000000000000..a69398534a18
--- /dev/null
+++ b/devel/z80-asm/files/patch-z80-asm.c
@@ -0,0 +1,11 @@
+--- z80-asm.c.orig 2023-12-28 16:48:47 UTC
++++ z80-asm.c
+@@ -218,7 +218,7 @@ if (!a && cross && (b=table_entries()))
+ { struct info *ele;
+ ele= malloc(b*sizeof(struct info));
+ for(a=0;next_table_entry(&ele[a].label,&ele[a].value,&ele[a].lineno);a++);
+- qsort(ele,b,sizeof(struct info),compare);
++ qsort(ele,b,sizeof(struct info),(void *)compare);
+ printf(" Cross reference:\n");
+ printf(" symbol value hexa line\n");
+ for (a=0;a<b;a++)
diff --git a/devel/z80-asm/files/patch-z80-mon.c b/devel/z80-asm/files/patch-z80-mon.c
new file mode 100644
index 000000000000..dcb175d5fe3e
--- /dev/null
+++ b/devel/z80-asm/files/patch-z80-mon.c
@@ -0,0 +1,11 @@
+--- z80-mon.c.orig 2023-12-28 16:53:32 UTC
++++ z80-mon.c
+@@ -1359,7 +1359,7 @@ main(int argc,char **argv)
+ if (labels=table_entries())
+ { ele= malloc(labels*sizeof(struct info));
+ for(a=0;next_table_entry(&ele[a].label,&ele[a].value,&ele[a].lineno);a++);
+- qsort(ele,labels,sizeof(struct info),compare_addr);
++ qsort(ele,labels,sizeof(struct info),(void *)compare_addr);
+ }
+ next_label_index=0;
+ old_pc=PC;
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-17 11:59:43 +0000