//
// 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-2019 Reboot and Friends
// RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
// Source utilised with the kind permission of Landon Dyer
//
#include "amode.h"
#include "error.h"
#include "expr.h"
+#include "fltpoint.h"
#include "listing.h"
#include "mach.h"
#include "macro.h"
#include "sect.h"
#include "symbol.h"
#include "token.h"
-#include "math.h"
-#include "sect.h"
#define DEF_KW
#include "kwtab.h"
+
TOKEN exprbuf[128]; // Expression buffer
SYM * symbolPtr[1000000]; // Symbol pointers table
static long unused; // For supressing 'write' warnings
// 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);
int d_prgflags(void);
int d_opt(void);
int d_dsp(void);
+int d_objproc(void);
void SetLargestAlignment(int);
// Directive handler table
d_68882, // 63 .68882
d_56001, // 64 .56001
d_nofpu, // 65 nofpu
- d_opt, // 58 .opt
+ d_opt, // 66 .opt
+ d_objproc, // 67 .objproc
};
{
uint64_t address;
- if (!rgpu && !rdsp && !m6502)
- return error(".org permitted only in gpu/dsp and 6502 sections");
+ if (!rgpu && !rdsp && !robjproc && !m6502 && !dsp56001)
+ return error(".org permitted only in GPU/DSP/OP, 56001 and 6502 sections");
- if (abs_expr(&address) == ERROR)
+ // M56K can leave the expression off the org for some reason :-/
+ if ((abs_expr(&address) == ERROR) && !dsp56001)
{
error("cannot determine org'd address");
return ERROR;
}
- if (rgpu | rdsp)
+ if (rgpu | rdsp | robjproc)
{
orgaddr = address;
orgactive = 1;
}
- else
+ else if (m6502)
{
- // 6502. We also kludge `lsloc' so the listing generator doesn't try
+ // 6502. We also kludge 'lsloc' so the listing generator doesn't try
// to spew out megabytes.
if (address > 0xFFFF)
return error(range_error);
chptr = scode->chptr + address;
orgaddr = address;
orgactive = 1;
- at_eol();
+ }
+ else if (dsp56001)
+ {
}
+ at_eol();
return 0;
}
while (*tok != EOL)
{
- switch(*tok)
+ switch (*tok)
{
case STRING:
sprintf(prntstr, "%s", string[tok[1]]);
case '/':
formatting = 1;
- if (tok[1] != SYMBOL)
+ // "X" & "L" get tokenized now... :-/ Probably should look into preventing this kind of thing from happening (was added with DSP56K code)
+ if ((tok[1] != SYMBOL) && (tok[1] != KW_L) && (tok[1] != KW_X))
goto token_err;
-// strcpy(prntstr, (char *)tok[2]);
- strcpy(prntstr, string[tok[2]]);
-
- switch(prntstr[0])
+ if (tok[1] == KW_L)
{
- case 'l': case 'L': wordlong = 1; break;
- case 'w': case 'W': wordlong = 0; break;
- case 'x': case 'X': outtype = 0; break;
- case 'd': case 'D': outtype = 1; break;
- case 'u': case 'U': outtype = 2; break;
- default:
- error("unknown print format flag");
- return ERROR;
+ wordlong = 1;
+ tok += 2;
+ }
+ else if (tok[1] == KW_X)
+ {
+ outtype = 0;
+ tok += 2;
+ }
+ else
+ {
+ strcpy(prntstr, string[tok[2]]);
+
+ switch (prntstr[0])
+ {
+ case 'l': case 'L': wordlong = 1; break;
+ case 'w': case 'W': wordlong = 0; break;
+ case 'x': case 'X': outtype = 0; break;
+ case 'd': case 'D': outtype = 1; break;
+ case 'u': case 'U': outtype = 2; break;
+ default:
+ error("unknown print format flag");
+ return ERROR;
+ }
+
+ tok += 3;
}
- tok += 3;
break;
case ',':
tok++;
return 0;
token_err:
- error("illegal print token");
+ error("illegal print token [@ '%s']", prntstr);
return ERROR;
}
if (*tok != STRING)
{
- error("syntax error; string missing");
+ error("syntax error; file to include missing");
return ERROR;
}
uint64_t eval;
- if (cursect != M6502)
+ if ((cursect & (M6502 | M56KPXYL)) == 0)
{
if ((siz != SIZB) && (sloc & 1)) // Automatic .even
auto_even();
//
-// dc.b, dc.w / dc, dc.l, dc.i
+// dc.b, dc.w / dc, dc.l, dc.i, dc.q, dc.d
//
int d_dc(WORD siz)
{
WORD eattr;
uint64_t eval;
- WORD tdb;
- WORD defined;
- uint64_t val64;
uint8_t * p;
if ((scattr & SBSS) != 0)
for(p=string[tok[1]]; *p!=EOS; p++)
D_byte(*p);
}
- else if(*tok == STRINGA8)
+ else if (*tok == STRINGA8)
{
for(p=string[tok[1]]; *p!=EOS; p++)
D_byte(strtoa8[*p]);
siz = SIZL;
}
- if (siz != SIZQ)
- {
// dc.x <expression>
SYM * esym = 0;
if (expr(exprbuf, &eval, &eattr, &esym) != OK)
return 0;
- }
- else
- {
- val64 = *(uint64_t *)(tok);
- tok = tok + 2;
- D_long((uint32_t)(val64 >> 32));
- D_long((uint32_t)val64);
- goto comma;
- }
-
- tdb = (WORD)(eattr & TDB);
- defined = (WORD)(eattr & DEFINED);
-
- if ((challoc - ch_size) < 4)
- chcheck(4);
+ uint16_t tdb = eattr & TDB;
+ uint16_t defined = eattr & DEFINED;
switch (siz)
{
D_long(eval);
}
+
+ break;
+ case SIZQ:
+ // 64-bit size
+ if (m6502)
+ return error(in_6502mode);
+
+ // Shamus: We only handle DC.Q type stuff, will have to add fixups
+ // and stuff later (maybe... might not be needed...)
+ // 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
{
- double vv;
- if (tdb)
- MarkRelocatable(cursect, sloc, tdb, MDOUBLE, NULL);
-
- 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;
case SIZX:
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
{
- float vv;
- if (tdb)
- MarkRelocatable(cursect, sloc, tdb, MEXTEND, NULL);
-
- 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 != ',')
break;
// Get repeat count (defaults to 1)
if (*tok == '#')
{
- ++tok;
+ tok++;
if (abs_expr(&count) != OK)
return 0;
if (expr(exprbuf, &eval, &eattr, NULL) < 0)
return 0;
- switch ((int)*tok++)
+ switch (*tok++)
{ // Determine size of object to deposit
case DOTB: siz = SIZB; break;
case DOTW: siz = SIZB; break;
dep_block((uint32_t)count, siz, (uint32_t)eval, eattr, exprbuf);
- switch ((int)*tok)
+ switch (*tok)
{
case EOL:
return 0;
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)
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;
}
//
int d_68000(void)
{
- rgpu = rdsp = 0;
+ rgpu = rdsp = robjproc = dsp56001 = 0;
// Switching from gpu/dsp sections should reset any ORG'd Address
orgactive = 0;
orgwarning = 0;
{
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;
}
//
-// DSP56001
+// .56001 - Switch to DSP56001 assembler
//
int d_56001(void)
{
- return error("Not yet, child. Be patient.");
+ dsp56001 = 1;
+ rgpu = rdsp = robjproc = 0;
+ SaveSection();
+
+ if (obj_format == LOD || obj_format == P56)
+ SwitchSection(M56001P);
+
+ return 0;
}
return ERROR;
}
- // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
+ // If previous section was DSP or 68000 then we need to reset ORG'd Addresses
if (!rgpu)
{
-//printf("Resetting ORG...\n");
orgactive = 0;
orgwarning = 0;
}
-//else printf("NOT resetting ORG!\n");
rgpu = 1; // Set GPU assembly
rdsp = 0; // Unset DSP assembly
+ robjproc = 0; // Unset OP assembly
+ dsp56001 = 0; // Unset 56001 assembly
regbank = BANK_N; // Set no default register bank
return 0;
}
rdsp = 1; // Set DSP assembly
rgpu = 0; // Unset GPU assembly
+ robjproc = 0; // Unset OP assembly
+ dsp56001 = 0; // Unset 56001 assembly
regbank = BANK_N; // Set no default register bank
return 0;
}
AddToSymbolDeclarationList(symbol);
symbol->sattr |= (ABS | DEFINED | EQUATED);
- symbol->svalue = (uint32_t)eval;
+ symbol->svalue = eval;
tok += 2;
// What this does is eat any dot suffixes attached to a symbol. If
}
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
}
+//
+// 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
+ dsp56001 = 0; // Unset 56001 assembly
+ return OK;
+}
+
+
//
// Undefine a macro - .undefmac macname [, macname...]
//
projects / rmac / blobdiff