Kill the z80.cr plugin, and use the disasm into z80

Author: radare

libr/asm/p/Makefile

@@ -16,7 +16,7 @@ ARCHS=mips_gnu.mk x86_cs.mk sparc_cs.mk sparc_gnu.mk java.mk bf.mk arm_gnu.mk da
 ARCHS+=x86_as.mk x86_nz.mk cris_gnu.mk vax.mk
 ARCHS+=ppc_gnu.mk ppc_cs.mk x86_olly.mk x86_udis.mk xap.mk x86_nasm.mk avr.mk
 ARCHS+=sh.mk arm_winedbg.mk tms320.mk gb.mk snes.mk ebc.mk malbolge.mk ws.mk
-ARCHS+=6502.mk h8300.mk cr16.mk v850.mk spc700.mk propeller.mk msp430.mk i4004.mk z80_cr.mk
+ARCHS+=6502.mk h8300.mk cr16.mk v850.mk spc700.mk propeller.mk msp430.mk i4004.mk
 ARCHS+=lh5801.mk v810.mk mcs96.mk lm32.mk
 ARCHS+=riscv.mk rsp.mk
 include $(ARCHS)

libr/asm/p/asm_z80.c

@@ -5,23 +5,38 @@
 #include <r_lib.h>
 #include <r_asm.h>
 
+#define GPL_COMPLIANT 1
+
 #include "../arch/z80/z80.c"
 
 static int do_assemble(RAsm *a, RAsmOp *op, const char *buf) {
 	return op->size = z80asm (op->buf, buf);
 }
 
+#if GPL_COMPLIANT
+#include "../arch/z80_cr/z80_cr.c"
+
+static int do_disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
+	return op->size = z80Disass (op, buf, len);
+}
+#else
+
 static int do_disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
 	int dlen = z80dis (0, buf, op->buf_asm, len);
 	if (dlen<0) dlen = 0;
 	op->size = dlen;
 	return op->size;
 }
+#endif
 
 RAsmPlugin r_asm_plugin_z80 = {
 	.name = "z80",
 	.desc = "Zilog Z80",
+#if GPL_COMPLIANT
+	.license = "GPL",
+#else
 	.license = "NC-GPL2", //NON-COMMERCIAL",
+#endif
 	.arch = "z80",
 	.bits = 8,
 	.endian = R_SYS_ENDIAN_NONE,

libr/asm/p/asm_z80_cr.c

@@ -226,7 +226,6 @@ extern RAsmPlugin r_asm_plugin_propeller;
 extern RAsmPlugin r_asm_plugin_msp430;
 extern RAsmPlugin r_asm_plugin_i4004;
 extern RAsmPlugin r_asm_plugin_cris_gnu;
-extern RAsmPlugin r_asm_plugin_z80_cr;
 extern RAsmPlugin r_asm_plugin_lh5801;
 extern RAsmPlugin r_asm_plugin_hppa_gnu;
 extern RAsmPlugin r_asm_plugin_v810;

libr/asm/p/z80_cr.mk

@@ -97,7 +97,6 @@ asm.x86_udis
 asm.x86_nasm
 asm.xcore_cs
 asm.z80
-asm.z80_cr
 asm.lh5801
 asm.v810
 asm.vax

libr/include/r_asm.h

@@ -56,7 +56,7 @@ asm.x86_new
 asm.x86_nz
 asm.x86_udis
 asm.xcore_cs
-asm.z80_cr
+asm.z80
 bin.any
 bin.bf
 bin.bios