X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fz80%2Fmain.c;h=adc65c09523d7af462524f90be140ae759f9db78;hb=d08e6df2202ed3f19b681221b502dedb3c6c8a28;hp=a5e840647a88fbfc47b797fe5d6486c4b0a54ae6;hpb=ee76e2f5985c5917392f3f6ea121db57a9e314ce;p=fw%2Fsdcc diff --git a/src/z80/main.c b/src/z80/main.c index a5e84064..adc65c09 100644 --- a/src/z80/main.c +++ b/src/z80/main.c @@ -27,7 +27,18 @@ #include "MySystem.h" #include "BuildCmd.h" #include "SDCCutil.h" -#include "dbuf.h" +#include "SDCCargs.h" +#include "dbuf_string.h" + +#define OPTION_BO "-bo" +#define OPTION_BA "-ba" +#define OPTION_CODE_SEG "--codeseg" +#define OPTION_CONST_SEG "--constseg" +#define OPTION_CALLEE_SAVES_BC "--callee-saves-bc" +#define OPTION_PORTMODE "--portmode=" +#define OPTION_ASM "--asm=" +#define OPTION_NO_STD_CRT0 "--no-std-crt0" + static char _z80_defaultRules[] = { @@ -43,17 +54,26 @@ static char _gbz80_defaultRules[] = Z80_OPTS z80_opts; -static OPTION _z80_options[] = +static OPTION _z80_options[] = { - { 0, "--callee-saves-bc", &z80_opts.calleeSavesBC, "Force a called function to always save BC" }, - { 0, "--portmode=", NULL, "Determine PORT I/O mode (z80/z180)" }, - { 0, NULL } + { 0, OPTION_CALLEE_SAVES_BC, &z80_opts.calleeSavesBC, "Force a called function to always save BC" }, + { 0, OPTION_PORTMODE, NULL, "Determine PORT I/O mode (z80/z180)" }, + { 0, OPTION_ASM, NULL, "Define assembler name (rgbds/asxxxx/isas/z80asm)" }, + { 0, OPTION_CODE_SEG, &options.code_seg, " use this name for the code segment", CLAT_STRING }, + { 0, OPTION_CONST_SEG, &options.const_seg, " use this name for the const segment", CLAT_STRING }, + { 0, OPTION_NO_STD_CRT0, &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.o"}, + { 0, NULL } }; static OPTION _gbz80_options[] = { - { 0, "--callee-saves-bc", &z80_opts.calleeSavesBC, "Force a called function to always save BC" }, - { 0, NULL } + { 0, OPTION_BO, NULL, " use code bank " }, + { 0, OPTION_BA, NULL, " use data bank " }, + { 0, OPTION_CALLEE_SAVES_BC, &z80_opts.calleeSavesBC, "Force a called function to always save BC" }, + { 0, OPTION_CODE_SEG, &options.code_seg, " use this name for the code segment", CLAT_STRING }, + { 0, OPTION_CONST_SEG, &options.const_seg, " use this name for the const segment", CLAT_STRING }, + { 0, OPTION_NO_STD_CRT0, &options.no_std_crt0, "For the z80/gbz80 do not link default crt0.o"}, + { 0, NULL } }; typedef enum @@ -92,12 +112,9 @@ extern PORT z80_port; #include "mappings.i" static builtins _z80_builtins[] = { - /* Disabled for now. - { "__builtin_strcpy", "v", 2, {"cg*", "cg*" } }, - { "__builtin_memcpy", "cg*", 3, {"cg*", "cg*", "ui" } }, - */ - { NULL , NULL,0, {NULL}} -}; + { "__builtin_memcpy", "vg*", 3, {"vg*", "vg*", "ui" } }, + { NULL , NULL, 0, {NULL}} +}; static void _z80_init (void) @@ -121,7 +138,7 @@ _reset_regparm (void) static int _reg_parm (sym_link * l, bool reentrant) { - if (options.noRegParams) + if (options.noRegParams) { return FALSE; } @@ -141,7 +158,9 @@ _reg_parm (sym_link * l, bool reentrant) enum { P_BANK = 1, - P_PORTMODE + P_PORTMODE, + P_CODESEG, + P_CONSTSEG, }; static int @@ -157,7 +176,9 @@ do_pragma(int id, const char *name, const char *cp) { case P_BANK: { - char buffer[128]; + struct dbuf_s buffer; + + dbuf_init(&buffer, 128); cp = get_pragma_token(cp, &token); @@ -170,43 +191,45 @@ do_pragma(int id, const char *name, const char *cp) case TOKEN_INT: switch (_G.asmType) { - case ASM_TYPE_ASXXXX: - sprintf(buffer, "CODE_%d", token.val.int_val); - break; + case ASM_TYPE_ASXXXX: + dbuf_printf (&buffer, "CODE_%d", token.val.int_val); + break; case ASM_TYPE_RGBDS: - sprintf(buffer, "CODE,BANK[%d]", token.val.int_val); - break; + dbuf_printf (&buffer, "CODE,BANK[%d]", token.val.int_val); + break; - case ASM_TYPE_ISAS: - /* PENDING: what to use for ISAS? */ - sprintf (buffer, "CODE,BANK(%d)", token.val.int_val); - break; + case ASM_TYPE_ISAS: + /* PENDING: what to use for ISAS? */ + dbuf_printf (&buffer, "CODE,BANK(%d)", token.val.int_val); + break; - default: - wassert (0); + default: + wassert (0); } break; default: { - const char *str = get_pragma_string(&token); + const char *str = get_pragma_string (&token); - strcpy(buffer, (0 == strcmp("BASE", str)) ? "HOME" : str); + dbuf_append_str (&buffer, (0 == strcmp("BASE", str)) ? "HOME" : str); } break; } - cp = get_pragma_token(cp, &token); + cp = get_pragma_token (cp, &token); if (TOKEN_EOL != token.type) { err = 1; break; } - gbz80_port.mem.code_name = Safe_strdup (buffer); + dbuf_c_str (&buffer); + /* ugly, see comment in src/port.h (borutr) */ + gbz80_port.mem.code_name = dbuf_detach (&buffer); code->sname = gbz80_port.mem.code_name; - options.code_seg = gbz80_port.mem.code_name; + options.code_seg = (char *)gbz80_port.mem.code_name; } break; @@ -214,7 +237,7 @@ do_pragma(int id, const char *name, const char *cp) { /*.p.t.20030716 - adding pragma to manipulate z80 i/o port addressing modes */ const char *str; - cp = get_pragma_token(cp, &token); + cp = get_pragma_token (cp, &token); if (TOKEN_EOL == token.type) { @@ -222,9 +245,9 @@ do_pragma(int id, const char *name, const char *cp) break; } - str = get_pragma_string(&token); + str = get_pragma_string (&token); - cp = get_pragma_token(cp, &token); + cp = get_pragma_token (cp, &token); if (TOKEN_EOL != token.type) { err = 1; @@ -244,6 +267,41 @@ do_pragma(int id, const char *name, const char *cp) } break; + case P_CODESEG: + case P_CONSTSEG: + { + char *segname; + + cp = get_pragma_token (cp, &token); + if (token.type == TOKEN_EOL) + { + err = 1; + break; + } + + segname = Safe_strdup (get_pragma_string(&token)); + + cp = get_pragma_token (cp, &token); + if (token.type != TOKEN_EOL) + { + Safe_free (segname); + err = 1; + break; + } + + if (id == P_CODESEG) + { + if (options.code_seg) Safe_free(options.code_seg); + options.code_seg = segname; + } + else + { + if (options.const_seg) Safe_free(options.const_seg); + options.const_seg = segname; + } + } + break; + default: processed = 0; break; @@ -261,6 +319,8 @@ do_pragma(int id, const char *name, const char *cp) static struct pragma_s pragma_tbl[] = { { "bank", P_BANK, 0, do_pragma }, { "portmode", P_PORTMODE, 0, do_pragma }, + { "codeseg", P_CODESEG, 0, do_pragma }, + { "constseg", P_CONSTSEG, 0, do_pragma }, { NULL, 0, 0, NULL }, }; @@ -321,71 +381,86 @@ _parseOptions (int *pargc, char **argv, int *i) { if (argv[*i][0] == '-') { - if (argv[*i][1] == 'b' && IS_GB) - { - int bank = atoi (argv[*i] + 3); - char buffer[128]; - switch (argv[*i][2]) - { - case 'o': - /* ROM bank */ - sprintf (buffer, "CODE_%u", bank); - gbz80_port.mem.code_name = Safe_strdup (buffer); - options.code_seg = gbz80_port.mem.code_name; - return TRUE; - case 'a': - /* RAM bank */ - sprintf (buffer, "DATA_%u", bank); - gbz80_port.mem.data_name = Safe_strdup (buffer); - return TRUE; - } - } - else if (!strncmp (argv[*i], "--asm=", 6)) - { - if (!strcmp (argv[*i], "--asm=rgbds")) - { - asm_addTree (&_rgbds_gb); - gbz80_port.assembler.cmd = _gbz80_rgbasmCmd; - gbz80_port.linker.cmd = _gbz80_rgblinkCmd; - gbz80_port.linker.do_link = _gbz80_rgblink; - _G.asmType = ASM_TYPE_RGBDS; - return TRUE; - } - else if (!strcmp (argv[*i], "--asm=asxxxx")) - { - _G.asmType = ASM_TYPE_ASXXXX; - return TRUE; - } - else if (!strcmp (argv[*i], "--asm=isas")) - { - asm_addTree (&_isas_gb); - /* Munge the function prefix */ - gbz80_port.fun_prefix = ""; - _G.asmType = ASM_TYPE_ISAS; - return TRUE; - } - else if (!strcmp (argv[*i], "--asm=z80asm")) - { + if (IS_GB) + { + if (!strncmp (argv[*i], OPTION_BO, sizeof (OPTION_BO) - 1)) + { + /* ROM bank */ + int bank = getIntArg (OPTION_BO, argv, i, *pargc); + struct dbuf_s buffer; + + dbuf_init (&buffer, 16); + dbuf_printf (&buffer, "CODE_%u", bank); + dbuf_c_str (&buffer); + /* ugly, see comment in src/port.h (borutr) */ + gbz80_port.mem.code_name = dbuf_detach (&buffer); + options.code_seg = (char *)gbz80_port.mem.code_name; + return TRUE; + } + else if (!strncmp (argv[*i], OPTION_BA, sizeof (OPTION_BA) - 1)) + { + /* RAM bank */ + int bank = getIntArg (OPTION_BA, argv, i, *pargc); + struct dbuf_s buffer; + + dbuf_init (&buffer, 16); + dbuf_printf (&buffer, "DATA_%u", bank); + dbuf_c_str (&buffer); + /* ugly, see comment in src/port.h (borutr) */ + gbz80_port.mem.data_name = dbuf_detach (&buffer); + return TRUE; + } + } + else if (!strncmp (argv[*i], OPTION_ASM, sizeof (OPTION_ASM) - 1)) + { + char *asmblr = getStringArg (OPTION_ASM, argv, i, *pargc); + + if (!strcmp (asmblr, "rgbds")) + { + asm_addTree (&_rgbds_gb); + gbz80_port.assembler.cmd = _gbz80_rgbasmCmd; + gbz80_port.linker.cmd = _gbz80_rgblinkCmd; + gbz80_port.linker.do_link = _gbz80_rgblink; + _G.asmType = ASM_TYPE_RGBDS; + return TRUE; + } + else if (!strcmp (asmblr, "asxxxx")) + { + _G.asmType = ASM_TYPE_ASXXXX; + return TRUE; + } + else if (!strcmp (asmblr, "isas")) + { + asm_addTree (&_isas_gb); + /* Munge the function prefix */ + gbz80_port.fun_prefix = ""; + _G.asmType = ASM_TYPE_ISAS; + return TRUE; + } + else if (!strcmp (asmblr, "z80asm")) + { port->assembler.externGlobal = TRUE; - asm_addTree (&_z80asm_z80); - _G.asmType = ASM_TYPE_ISAS; - return TRUE; - } - } - else if (!strncmp (argv[*i], "--portmode=", 11)) - { - if (!strcmp (argv[*i], "--portmode=z80")) - { - z80_opts.port_mode = 80; - return TRUE; - } - else if (!strcmp (argv[*i], "--portmode=z180")) - { - z80_opts.port_mode = 180; - return TRUE; - } - } - } + asm_addTree (&_z80asm_z80); + _G.asmType = ASM_TYPE_ISAS; + return TRUE; + } + } + else if (!strncmp (argv[*i], OPTION_PORTMODE, sizeof (OPTION_PORTMODE) - 1)) + { + char *portmode = getStringArg (OPTION_ASM, argv, i, *pargc); + + if (!strcmp (portmode, "z80")) + { + z80_opts.port_mode = 80; + return TRUE; + } + else if (!strcmp (portmode, "z180")) + { + z80_opts.port_mode = 180; + return TRUE; + } + } + } return FALSE; } @@ -405,10 +480,10 @@ _setValues(void) for (s = setFirstItem(libDirsSet); s != NULL; s = setNextItem(libDirsSet)) { buildCmdLine2(path, sizeof path, "-k\"%s" DIR_SEPARATOR_STRING "{port}\" ", s); - dbuf_append(&dbuf, path, strlen(path)); + dbuf_append_str(&dbuf, path); } buildCmdLine2(path, sizeof path, "-l\"{port}.lib\"", s); - dbuf_append(&dbuf, path, strlen(path)); + dbuf_append_str(&dbuf, path); setMainValue ("z80libspec", dbuf_c_str(&dbuf)); dbuf_destroy(&dbuf); @@ -433,7 +508,7 @@ _setValues(void) SNPRINTF(buf, len, "\"%s\"", path); setMainValue("z80crt0", buf); Safe_free(buf); - } + } } else { @@ -448,7 +523,7 @@ _setValues(void) if (IS_GB) { - setMainValue ("z80outputtypeflag", "-z"); + setMainValue ("z80outputtypeflag", "-Z"); setMainValue ("z80outext", ".gb"); } else @@ -509,7 +584,7 @@ _setDefaultOptions (void) optimize.loopInduction = 1; } -/* Mangaling format: +/* Mangling format: _fun_policy_params where: policy is the function policy @@ -520,7 +595,7 @@ _setDefaultOptions (void) where: r is 'r' for reentrant, 's' for static functions s is 'c' for callee saves, 'r' for caller saves - p is 'p' for profiling on, 'x' for profiling off + f is 'f' for profiling on, 'x' for profiling off examples: rr - reentrant, caller saves params format: @@ -536,7 +611,7 @@ _mangleSupportFunctionName(char *original) sprintf(buffer, "%s_rr%s_%s", original, options.profile ? "f" : "x", - options.noRegParams ? "s" : "bds" + options.noRegParams ? "s" : "bds" /* MB: but the library only has hds variants ??? */ ); return Safe_strdup(buffer); @@ -571,9 +646,16 @@ _hasNativeMulFor (iCode *ic, sym_link *left, sym_link *right) } else if ( IS_LITERAL (right)) { - test = left; + test = right; val = OP_VALUE (IC_RIGHT (ic)); } + /* 8x8 unsigned multiplication code is shorter than + call overhead for the multiplication routine. */ + else if ( IS_CHAR (right) && IS_UNSIGNED (right) && + IS_CHAR (left) && IS_UNSIGNED(left) && !IS_GB) + { + return TRUE; + } else { return FALSE; @@ -628,38 +710,43 @@ PORT z80_port = { TARGET_ID_Z80, "z80", - "Zilog Z80", /* Target name */ - NULL, /* Processor name */ + "Zilog Z80", /* Target name */ + NULL, /* Processor name */ { glue, FALSE, MODEL_MEDIUM | MODEL_SMALL, MODEL_SMALL }, - { + { /* Assembler */ NULL, ASMCMD, - "-plosgff", /* Options with debug */ - "-plosgff", /* Options without debug */ + "-plosgffc", /* Options with debug */ + "-plosgff", /* Options without debug */ 0, ".asm" }, - { + { /* Linker */ NULL, LINKCMD, NULL, ".o", 1 }, - { - _z80_defaultRules + { /* Peephole optimizer */ + _z80_defaultRules, + 0, + 0, + 0, + 0, + z80notUsed }, { - /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */ + /* Sizes: char, short, int, long, ptr, fptr, gptr, bit, float, max */ 1, 2, 2, 4, 2, 2, 2, 1, 4, 4 }, /* tags for generic pointers */ - { 0x00, 0x40, 0x60, 0x80 }, /* far, near, xstack, code */ + { 0x00, 0x40, 0x60, 0x80 }, /* far, near, xstack, code */ { "XSEG", "STACK", @@ -678,6 +765,8 @@ PORT z80_port = NULL, /* xinit */ NULL, /* const_name */ "CABS", /* cabs_name */ + NULL, /* xabs_name */ + NULL, /* iabs_name */ NULL, NULL, 1 @@ -713,32 +802,32 @@ PORT z80_port = z80_assignRegisters, _getRegName, _keywords, - 0, /* no assembler preamble */ - NULL, /* no genAssemblerEnd */ - 0, /* no local IVT generation code */ + 0, /* no assembler preamble */ + NULL, /* no genAssemblerEnd */ + 0, /* no local IVT generation code */ 0, /* no genXINIT code */ - NULL, /* genInitStartup */ + NULL, /* genInitStartup */ _reset_regparm, _reg_parm, _process_pragma, _mangleSupportFunctionName, _hasNativeMulFor, - hasExtBitOp, /* hasExtBitOp */ - oclsExpense, /* oclsExpense */ + hasExtBitOp, /* hasExtBitOp */ + oclsExpense, /* oclsExpense */ TRUE, - TRUE, /* little endian */ - 0, /* leave lt */ - 0, /* leave gt */ - 1, /* transform <= to ! > */ - 1, /* transform >= to ! < */ - 1, /* transform != to !(a == b) */ - 0, /* leave == */ - TRUE, /* Array initializer support. */ + TRUE, /* little endian */ + 0, /* leave lt */ + 0, /* leave gt */ + 1, /* transform <= to ! > */ + 1, /* transform >= to ! < */ + 1, /* transform != to !(a == b) */ + 0, /* leave == */ + TRUE, /* Array initializer support. */ 0, /* no CSE cost estimation yet */ - _z80_builtins, /* no builtin functions */ - GPOINTER, /* treat unqualified pointers as "generic" pointers */ - 1, /* reset labelKey to 1 */ - 1, /* globals & local static allowed */ + _z80_builtins, /* builtin functions */ + GPOINTER, /* treat unqualified pointers as "generic" pointers */ + 1, /* reset labelKey to 1 */ + 1, /* globals & local static allowed */ PORT_MAGIC }; @@ -747,7 +836,7 @@ PORT gbz80_port = { TARGET_ID_GBZ80, "gbz80", - "Gameboy Z80-like", /* Target name */ + "Gameboy Z80-like", /* Target name */ NULL, { glue, @@ -758,11 +847,11 @@ PORT gbz80_port = { NULL, ASMCMD, - "-plosgff", /* Options with debug */ - "-plosgff", /* Options without debug */ + "-plosgffc", /* Options with debug */ + "-plosgff", /* Options without debug */ 0, ".asm", - NULL /* no do_assemble function */ + NULL /* no do_assemble function */ }, { NULL, @@ -779,7 +868,7 @@ PORT gbz80_port = 1, 2, 2, 4, 2, 2, 2, 1, 4, 4 }, /* tags for generic pointers */ - { 0x00, 0x40, 0x60, 0x80 }, /* far, near, xstack, code */ + { 0x00, 0x40, 0x60, 0x80 }, /* far, near, xstack, code */ { "XSEG", "STACK", @@ -798,6 +887,8 @@ PORT gbz80_port = NULL, /* xinit */ NULL, /* const_name */ "CABS", /* cabs_name */ + NULL, /* xabs_name */ + NULL, /* iabs_name */ NULL, NULL, 1 @@ -833,31 +924,31 @@ PORT gbz80_port = z80_assignRegisters, _getRegName, _keywords, - 0, /* no assembler preamble */ - NULL, /* no genAssemblerEnd */ - 0, /* no local IVT generation code */ + 0, /* no assembler preamble */ + NULL, /* no genAssemblerEnd */ + 0, /* no local IVT generation code */ 0, /* no genXINIT code */ - NULL, /* genInitStartup */ + NULL, /* genInitStartup */ _reset_regparm, _reg_parm, _process_pragma, _mangleSupportFunctionName, _hasNativeMulFor, - hasExtBitOp, /* hasExtBitOp */ - oclsExpense, /* oclsExpense */ + hasExtBitOp, /* hasExtBitOp */ + oclsExpense, /* oclsExpense */ TRUE, - TRUE, /* little endian */ - 0, /* leave lt */ - 0, /* leave gt */ - 1, /* transform <= to ! > */ - 1, /* transform >= to ! < */ - 1, /* transform != to !(a == b) */ - 0, /* leave == */ + TRUE, /* little endian */ + 0, /* leave lt */ + 0, /* leave gt */ + 1, /* transform <= to ! > */ + 1, /* transform >= to ! < */ + 1, /* transform != to !(a == b) */ + 0, /* leave == */ TRUE, /* Array initializer support. */ 0, /* no CSE cost estimation yet */ - NULL, /* no builtin functions */ - GPOINTER, /* treat unqualified pointers as "generic" pointers */ - 1, /* reset labelKey to 1 */ - 1, /* globals & local static allowed */ + NULL, /* no builtin functions */ + GPOINTER, /* treat unqualified pointers as "generic" pointers */ + 1, /* reset labelKey to 1 */ + 1, /* globals & local static allowed */ PORT_MAGIC };