X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=direct.c;h=2511473fb5c89953decbe40a3579943dfb84f8c0;hp=d535c4842b40870f794dfeb424e28093b96c6dea;hb=66b362fa203d0850e8dce8045adb454e354c22ce;hpb=f3c7d186a15b89c39e360b9cc89545a0d24bd6a4 diff --git a/direct.c b/direct.c index d535c48..2511473 100644 --- a/direct.c +++ b/direct.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for all Atari computers // DIRECT.C - Directive Handling -// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -11,6 +11,7 @@ #include "amode.h" #include "error.h" #include "expr.h" +#include "fltpoint.h" #include "listing.h" #include "mach.h" #include "macro.h" @@ -20,16 +21,12 @@ #include "sect.h" #include "symbol.h" #include "token.h" -#include "math.h" -#include "sect.h" #define DEF_KW #include "kwtab.h" -// N.B.: It's perfectly fine to keep exprbuf as an array of TOKENS and to cast -// to a TOKENPTR where needed. But this works too. :-P -TOKEN _exprbuf[128]; // Expression buffer -TOKENPTR exprbuf = (TOKENPTR)_exprbuf; // Expression buffer point + +TOKEN exprbuf[128]; // Expression buffer SYM * symbolPtr[1000000]; // Symbol pointers table static long unused; // For supressing 'write' warnings char buffer[256]; // Scratch buffer for messages @@ -38,7 +35,6 @@ int largestAlign[3] = { 2, 2, 2 }; // Largest alignment value seen per section // Function prototypes int d_unimpl(void); int d_68000(void); -int d_68000(void); int d_68020(void); int d_68030(void); int d_68040(void); @@ -83,6 +79,7 @@ int d_cstruct(void); int d_prgflags(void); int d_opt(void); int d_dsp(void); +int d_objproc(void); void SetLargestAlignment(int); // Directive handler table @@ -153,7 +150,8 @@ int (*dirtab[])() = { d_68882, // 63 .68882 d_56001, // 64 .56001 d_nofpu, // 65 nofpu - d_opt, // 58 .opt + d_opt, // 66 .opt + d_objproc, // 67 .objproc }; @@ -176,14 +174,14 @@ void SetLargestAlignment(int size) // int d_error(char *str) { - if (*tok.u32 == EOL) + if (*tok == EOL) return error("error directive encountered - aborting assembling"); else { - switch(*tok.u32) + switch(*tok) { case STRING: - return error(string[tok.u32[1]]); + return error(string[tok[1]]); break; default: return error("error directive encountered--aborting assembly"); @@ -197,14 +195,14 @@ int d_error(char *str) // int d_warn(char *str) { - if (*tok.u32 == EOL) + if (*tok == EOL) return warn("WARNING WARNING WARNING"); else { - switch(*tok.u32) + switch(*tok) { case STRING: - return warn(string[tok.u32[1]]); + return warn(string[tok[1]]); break; default: return warn("WARNING WARNING WARNING"); @@ -220,8 +218,8 @@ int d_org(void) { uint64_t address; - if (!rgpu && !rdsp && !m6502) - return error(".org permitted only in gpu/dsp and 6502 sections"); + if (!rgpu && !rdsp && !robjproc && !m6502) + return error(".org permitted only in GPU/DSP/OP and 6502 sections"); if (abs_expr(&address) == ERROR) { @@ -229,7 +227,7 @@ int d_org(void) return ERROR; } - if (rgpu | rdsp) + if (rgpu | rdsp | robjproc) { orgaddr = address; orgactive = 1; @@ -276,27 +274,27 @@ int d_print(void) SYM * esym; // External symbol involved in expr. TOKEN r_expr[EXPRSIZE]; - while (*tok.u32 != EOL) + while (*tok != EOL) { - switch(*tok.u32) + switch(*tok) { case STRING: - sprintf(prntstr, "%s", string[tok.u32[1]]); + sprintf(prntstr, "%s", string[tok[1]]); printf("%s", prntstr); if (list_fd) unused = write(list_fd, prntstr, (LONG)strlen(prntstr)); - tok.u32 += 2; + tok += 2; break; case '/': formatting = 1; - if (tok.u32[1] != SYMBOL) + if (tok[1] != SYMBOL) goto token_err; -// strcpy(prntstr, (char *)tok.u32[2]); - strcpy(prntstr, string[tok.u32[2]]); +// strcpy(prntstr, (char *)tok[2]); + strcpy(prntstr, string[tok[2]]); switch(prntstr[0]) { @@ -310,13 +308,13 @@ int d_print(void) return ERROR; } - tok.u32 += 3; + tok += 3; break; case ',': - tok.u32++; + tok++; break; default: - if (expr((TOKENPTR)r_expr, &eval, &eattr, &esym) != OK) + if (expr(r_expr, &eval, &eattr, &esym) != OK) goto token_err; else { @@ -370,13 +368,13 @@ int d_ccundef(void) return ERROR; } - if (*tok.u32 != SYMBOL) + if (*tok != SYMBOL) { error("syntax error; expected symbol"); return ERROR; } - ccname = lookup(string[tok.u32[1]], LABEL, 0); + ccname = lookup(string[tok[1]], LABEL, 0); // Make sure symbol is a valid ccdef if (!ccname || !(ccname->sattre & EQUATEDCC)) @@ -402,18 +400,18 @@ int d_equrundef(void) if (!rgpu && !rdsp) return error(".equrundef/.regundef must be defined in .gpu/.dsp section"); - while (*tok.u32 != EOL) + while (*tok != EOL) { // Skip preceeding or seperating commas (if any) - if (*tok.u32 == ',') - tok.u32++; + if (*tok == ',') + tok++; // Check we are dealing with a symbol - if (*tok.u32 != SYMBOL) + if (*tok != SYMBOL) return error("syntax error; expected symbol"); // Lookup and undef if equated register - regname = lookup(string[tok.u32[1]], LABEL, 0); + regname = lookup(string[tok[1]], LABEL, 0); if (regname && (regname->sattre & EQUATEDREG)) { @@ -424,7 +422,7 @@ int d_equrundef(void) } // Skip over symbol token and address - tok.u32 += 2; + tok += 2; } return 0; @@ -455,11 +453,11 @@ int d_incbin(void) // Check to see if we're in BSS, and, if so, throw an error if (scattr & SBSS) { - error("cannot include binary file \"%s\" in BSS section", string[tok.u32[1]]); + error("cannot include binary file \"%s\" in BSS section", string[tok[1]]); return ERROR; } - if (*tok.u32 != STRING) + if (*tok != STRING) { error("syntax error; string missing"); return ERROR; @@ -468,7 +466,7 @@ int d_incbin(void) // Attempt to open the include file in the current directory, then (if that // failed) try list of include files passed in the enviroment string or by // the "-d" option. - if ((fd = open(string[tok.u32[1]], _OPEN_INC)) < 0) + if ((fd = open(string[tok[1]], _OPEN_INC)) < 0) { for(i=0; nthpath("RMACPATH", i, buf1)!=0; i++) { @@ -478,13 +476,13 @@ int d_incbin(void) if (fd > 0 && buf1[fd - 1] != SLASHCHAR) strcat(buf1, SLASHSTRING); - strcat(buf1, string[tok.u32[1]]); + strcat(buf1, string[tok[1]]); if ((fd = open(buf1, _OPEN_INC)) >= 0) goto allright; } - return error("cannot open: \"%s\"", string[tok.u32[1]]); + return error("cannot open: \"%s\"", string[tok[1]]); } allright: @@ -493,14 +491,14 @@ allright: pos = lseek(fd, 0L, SEEK_SET); chcheck(size); - DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok.u32[1]], size); } + DEBUG { printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size); } char * fileBuffer = (char *)malloc(size); bytesRead = read(fd, fileBuffer, size); if (bytesRead != size) { - error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok.u32[1]], size); + error("was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size); return ERROR; } @@ -718,21 +716,21 @@ int symlist(int(* func)()) for(;;) { - if (*tok.u32 != SYMBOL) + if (*tok != SYMBOL) return error(em); - if ((*func)(string[tok.u32[1]]) != OK) + if ((*func)(string[tok[1]]) != OK) break; - tok.u32 += 2; + tok += 2; - if (*tok.u32 == EOL) + if (*tok == EOL) break; - if (*tok.u32 != ',') + if (*tok != ',') return error(em); - tok.u32++; + tok++; } return 0; @@ -750,11 +748,11 @@ int d_include(void) char buf[128]; char buf1[128]; - if (*tok.u32 == STRING) // Leave strings ALONE - fn = string[*++tok.u32]; - else if (*tok.u32 == SYMBOL) // Try to append ".s" to symbols + if (*tok == STRING) // Leave strings ALONE + fn = string[*++tok]; + else if (*tok == SYMBOL) // Try to append ".s" to symbols { - strcpy(buf, string[*++tok.u32]); + strcpy(buf, string[*++tok]); fext(buf, ".s", 0); fn = &buf[0]; } @@ -763,7 +761,7 @@ int d_include(void) // Make sure the user didn't try anything like: // .include equates.s - if (*++tok.u32 != EOL) + if (*++tok != EOL) return error("extra stuff after filename--enclose it in quotes"); // Attempt to open the include file in the current directory, then (if that @@ -802,7 +800,7 @@ int d_assert(void) WORD eattr; uint64_t eval; - for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok.u32) + for(; expr(exprbuf, &eval, &eattr, NULL)==OK; ++tok) { if (!(eattr & DEFINED)) return error("forward or undefined .assert"); @@ -810,7 +808,7 @@ int d_assert(void) if (!eval) return error("assert failure"); - if (*tok.u32 != ',') + if (*tok != ',') break; } @@ -860,7 +858,7 @@ int d_prgflags(void) { uint64_t eval; - if (*tok.u32 == EOL) + if (*tok == EOL) return error("PRGFLAGS requires value"); else if (abs_expr(&eval) == OK) { @@ -886,7 +884,7 @@ int d_abs(void) SaveSection(); - if (*tok.u32 == EOL) + if (*tok == EOL) eval = 0; else if (abs_expr(&eval) != OK) return 0; @@ -992,7 +990,7 @@ int d_ds(WORD siz) } else { - dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), (TOKENPTR){NULL}); + dep_block(eval, siz, 0, (WORD)(DEFINED | ABS), NULL); } at_eol(); @@ -1023,24 +1021,24 @@ int d_dc(WORD siz) || (rdsp && (orgaddr >= 0xF1B000) && (orgaddr <= 0xF1CFFFF)))) warn("depositing LONGs on a non-long address in local RAM"); - for(;; tok.u32++) + for(;; tok++) { // dc.b 'string' [,] ... - if (siz == SIZB && (*tok.u32 == STRING || *tok.u32 == STRINGA8) && (tok.u32[2] == ',' || tok.u32[2] == EOL)) + if (siz == SIZB && (*tok == STRING || *tok == STRINGA8) && (tok[2] == ',' || tok[2] == EOL)) { - uint32_t i = strlen(string[tok.u32[1]]); + uint32_t i = strlen(string[tok[1]]); if ((challoc - ch_size) < i) chcheck(i); - if (*tok.u32 == STRING) + if (*tok == STRING) { - for(p=string[tok.u32[1]]; *p!=EOS; p++) + for(p=string[tok[1]]; *p!=EOS; p++) D_byte(*p); } - else if(*tok.u32 == STRINGA8) + else if(*tok == STRINGA8) { - for(p=string[tok.u32[1]]; *p!=EOS; p++) + for(p=string[tok[1]]; *p!=EOS; p++) D_byte(strtoa8[*p]); } else @@ -1048,16 +1046,16 @@ int d_dc(WORD siz) error("String format not supported... yet"); } - tok.u32 += 2; + tok += 2; goto comma; } int movei = 0; // MOVEI flag for dc.i - if (*tok.u32 == DOTI) + if (*tok == DOTI) { movei = 1; - tok.u32++; + tok++; siz = SIZL; } @@ -1070,9 +1068,6 @@ int d_dc(WORD siz) uint16_t tdb = eattr & TDB; uint16_t defined = eattr & DEFINED; - if ((challoc - ch_size) < 4) - chcheck(4); - switch (siz) { case SIZB: @@ -1140,6 +1135,7 @@ int d_dc(WORD siz) D_long(eval); } + break; case SIZQ: // 64-bit size @@ -1148,46 +1144,61 @@ int d_dc(WORD siz) // Shamus: We only handle DC.Q type stuff, will have to add fixups // and stuff later (maybe... might not be needed...) - D_quad(eval); + // DEFINITELY NEED FIXUPS HERE! + if (!defined) + { + AddFixup(FU_QUAD, sloc, exprbuf); + D_quad(0LL); + } + else + { + D_quad(eval); + } + break; case SIZS: + // 32-bit float size if (m6502) return error(in_6502mode); if (!defined) { - float vv = 0; AddFixup(FU_FLOATSING, sloc, exprbuf); - - D_single(vv); + D_long(0); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); - - D_single(eval); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MSINGLE, NULL); + + PTR ptr; + ptr.u64 = &eval; + uint32_t ieee754 = FloatToIEEE754((float)*ptr.dp); + D_long(ieee754); } break; case SIZD: + // 64-bit double size if (m6502) return error(in_6502mode); if (!defined) { - double vv = 0; AddFixup(FU_FLOATDOUB, sloc, exprbuf); - - D_double(vv); + D_quad(0LL); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); - - double vv = *(double *)&eval; - D_double(vv); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL); + + PTR ptr; + ptr.u64 = &eval; + uint64_t ieee754 = DoubleToIEEE754(*ptr.dp); + D_quad(ieee754); } break; @@ -1195,27 +1206,31 @@ int d_dc(WORD siz) if (m6502) return error(in_6502mode); + uint8_t extDbl[12]; + memset(extDbl, 0, 12); + if (!defined) { - double vv = 0; AddFixup(FU_FLOATEXT, sloc, exprbuf); - - D_extend(vv); + D_extend(extDbl); } else { - if (tdb) - MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); - - float vv = *(double *)&eval; - D_extend(vv); +//Would this *ever* happen? +// if (tdb) +// MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL); + + PTR ptr; + ptr.u64 = &eval; + DoubleToExtended(*ptr.dp, extDbl); + D_extend(extDbl); } break; } comma: - if (*tok.u32 != ',') + if (*tok != ',') break; } @@ -1240,7 +1255,7 @@ int d_dcb(WORD siz) if (abs_expr(&evalc) != OK) return 0; - if (*tok.u32++ != ',') + if (*tok++ != ',') return error("missing comma"); if (expr(exprbuf, &eval, &eattr, NULL) < 0) @@ -1280,14 +1295,14 @@ int d_init(WORD def_siz) for(;;) { // Get repeat count (defaults to 1) - if (*tok.u32 == '#') + if (*tok == '#') { - tok.u32++; + tok++; if (abs_expr(&count) != OK) return 0; - if (*tok.u32++ != ',') + if (*tok++ != ',') return error(comma_error); } else @@ -1297,25 +1312,25 @@ int d_init(WORD def_siz) if (expr(exprbuf, &eval, &eattr, NULL) < 0) return 0; - switch (*tok.u32++) + switch (*tok++) { // Determine size of object to deposit case DOTB: siz = SIZB; break; case DOTW: siz = SIZB; break; case DOTL: siz = SIZL; break; default: siz = def_siz; - tok.u32--; + tok--; break; } dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf); - switch (*tok.u32) + switch (*tok) { case EOL: return 0; case ',': - tok.u32++; + tok++; continue; default: return error(comma_error); @@ -1327,7 +1342,7 @@ int d_init(WORD def_siz) // // Deposit 'count' values of size 'siz' in the current (non-BSS) segment // -int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKENPTR exprbuf) +int dep_block(uint32_t count, WORD siz, uint32_t eval, WORD eattr, TOKEN * exprbuf) { WORD tdb; WORD defined; @@ -1421,13 +1436,13 @@ int d_comm(void) if (m6502) return error(in_6502mode); - if (*tok.u32 != SYMBOL) + if (*tok != SYMBOL) return error("missing symbol"); - p = string[tok.u32[1]]; - tok.u32 += 2; + p = string[tok[1]]; + tok += 2; - if (*p == '.') // Cannot .comm a local symbol + if (*p == '.') // Cannot .comm a local symbol return error(locgl_error); if ((sym = lookup(p, LABEL, 0)) == NULL) @@ -1440,13 +1455,13 @@ int d_comm(void) sym->sattr = GLOBAL | COMMON | BSS; - if (*tok.u32++ != ',') + if (*tok++ != ',') return error(comma_error); - if (abs_expr(&eval) != OK) // Parse size of common region + if (abs_expr(&eval) != OK) // Parse size of common region return 0; - sym->svalue = (uint32_t)eval; // Install common symbol's size + sym->svalue = eval; // Install common symbol's size at_eol(); return 0; } @@ -1481,7 +1496,7 @@ int d_nlist(void) // int d_68000(void) { - rgpu = rdsp = 0; + rgpu = rdsp = robjproc = 0; // Switching from gpu/dsp sections should reset any ORG'd Address orgactive = 0; orgwarning = 0; @@ -1533,29 +1548,29 @@ int d_68060(void) { d_68000(); activecpu = CPU_68060; - activefpu = FPU_68040; + activefpu = FPU_68060; return 0; } // -// .68881 - Back to 68000 TEXT segment and select 68881 FPU +// .68881 - Back to 680x0 TEXT segment and select 68881 FPU // int d_68881(void) { - d_68000(); + //d_68000(); activefpu = FPU_68881; return 0; } // -// .68882 - Back to 68000 TEXT segment and select 68882 FPU +// .68882 - Back to 680x0 TEXT segment and select 68882 FPU // int d_68882(void) { - d_68000(); - activefpu = FPU_68881; + //d_68000(); + activefpu = FPU_68882; return 0; } @@ -1599,6 +1614,7 @@ int d_gpu(void) rgpu = 1; // Set GPU assembly rdsp = 0; // Unset DSP assembly + robjproc = 0; // Unset OP assembly regbank = BANK_N; // Set no default register bank return 0; } @@ -1624,6 +1640,7 @@ int d_dsp(void) rdsp = 1; // Set DSP assembly rgpu = 0; // Unset GPU assembly + robjproc = 0; // Unset OP assembly regbank = BANK_N; // Set no default register bank return 0; } @@ -1652,23 +1669,23 @@ int d_cargs(void) if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); - if (*tok.u32 == '#') + if (*tok == '#') { - tok.u32++; + tok++; if (abs_expr(&eval) != OK) return 0; // Eat the comma, if it's there - if (*tok.u32 == ',') - tok.u32++; + if (*tok == ',') + tok++; } for(;;) { - if (*tok.u32 == SYMBOL) + if (*tok == SYMBOL) { - p = string[tok.u32[1]]; + p = string[tok[1]]; // Set env to either local (dot prefixed) or global scope env = (*p == '.' ? curenv : 0); @@ -1686,24 +1703,24 @@ int d_cargs(void) AddToSymbolDeclarationList(symbol); symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = (uint32_t)eval; - tok.u32 += 2; + symbol->svalue = eval; + tok += 2; // What this does is eat any dot suffixes attached to a symbol. If // it's a .L, it adds 4 to eval; if it's .W or .B, it adds 2. If // there is no dot suffix, it assumes a size of 2. - switch ((int)*tok.u32) + switch ((int)*tok) { case DOTL: eval += 2; case DOTB: case DOTW: - tok.u32++; + tok++; } eval += 2; } - else if (*tok.u32 >= KW_D0 && *tok.u32 <= KW_A7) + else if (*tok >= KW_D0 && *tok <= KW_A7) { if (reglist(&rlist) < 0) return 0; @@ -1716,7 +1733,7 @@ int d_cargs(void) } else { - switch ((int)*tok.u32) + switch ((int)*tok) { case KW_USP: case KW_SSP: @@ -1726,7 +1743,7 @@ int d_cargs(void) case KW_SR: case KW_CCR: eval += 2; - tok.u32++; + tok++; break; case EOL: return 0; @@ -1736,8 +1753,8 @@ int d_cargs(void) } // Eat commas in between each argument, if they exist - if (*tok.u32 == ',') - tok.u32++; + if (*tok == ',') + tok++; } } @@ -1766,23 +1783,23 @@ int d_cstruct(void) if (rgpu || rdsp) return error("directive forbidden in gpu/dsp mode"); - if (*tok.u32 == '#') + if (*tok == '#') { - tok.u32++; + tok++; if (abs_expr(&eval) != OK) return 0; // Eat the comma, if it's there - if (*tok.u32 == ',') - tok.u32++; + if (*tok == ',') + tok++; } for(;;) { - if (*tok.u32 == SYMBOL) + if (*tok == SYMBOL) { - symbolName = string[tok.u32[1]]; + symbolName = string[tok[1]]; // Set env to either local (dot prefixed) or global scope env = (symbolName[0] == '.' ? curenv : 0); @@ -1801,11 +1818,11 @@ int d_cstruct(void) // Put symbol in "order of definition" list AddToSymbolDeclarationList(symbol); - tok.u32 += 2; + tok += 2; // Adjust label start address if it's a word or a long, as a byte // label might have left us on an odd address. - switch ((int)*tok.u32) + switch ((int)*tok) { case DOTW: case DOTL: @@ -1813,12 +1830,12 @@ int d_cstruct(void) } symbol->sattr |= (ABS | DEFINED | EQUATED); - symbol->svalue = (uint32_t)eval; + symbol->svalue = eval; // Check for dot suffixes and adjust space accordingly (longs and // words on an odd boundary get bumped to the next word aligned // address). If no suffix, then throw an error. - switch ((int)*tok.u32) + switch ((int)*tok) { case DOTL: eval += 4; @@ -1833,9 +1850,9 @@ int d_cstruct(void) return error("Symbol missing dot suffix in .cstruct construct"); } - tok.u32++; + tok++; } - else if (*tok.u32 >= KW_D0 && *tok.u32 <= KW_A7) + else if (*tok >= KW_D0 && *tok <= KW_A7) { if (reglist(&rlist) < 0) return 0; @@ -1848,7 +1865,7 @@ int d_cstruct(void) } else { - switch ((int)*tok.u32) + switch ((int)*tok) { case KW_USP: case KW_SSP: @@ -1858,7 +1875,7 @@ int d_cstruct(void) case KW_SR: case KW_CCR: eval += 2; - tok.u32++; + tok++; break; case EOL: return 0; @@ -1868,12 +1885,38 @@ int d_cstruct(void) } // Eat commas in between each argument, if they exist - if (*tok.u32 == ',') - tok.u32++; + if (*tok == ',') + tok++; } } +// +// Define start of OP object list (allows the use of ORG) +// +int d_objproc(void) +{ + if ((cursect != TEXT) && (cursect != DATA)) + { + error(".objproc can only be used in the TEXT or DATA segments"); + return ERROR; + } + + // If previous section was DSP or 68000 then we need to reset ORG'd + // Addresses + if (!robjproc) + { + orgactive = 0; + orgwarning = 0; + } + + robjproc = 1; // Set OP assembly + rgpu = 0; // Unset GPU assembly + rdsp = 0; // Unset DSP assembly + return OK; +} + + // // Undefine a macro - .undefmac macname [, macname...] // @@ -1921,12 +1964,12 @@ int d_gpumain(void) // int d_opt(void) { - while (*tok.u32 != EOL) + while (*tok != EOL) { - if (*tok.u32 == STRING) + if (*tok == STRING) { - tok.u32++; - char * tmpstr = string[*tok.u32++]; + tok++; + char * tmpstr = string[*tok++]; if (ParseOptimization(tmpstr) != OK) return error("unknown optimization flag '%s'", tmpstr);