#include "direct.h"
#include "sect.h"
-#include "risca.h"
+#include "riscasm.h"
#include "error.h"
#include "token.h"
#include "procln.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
+
// Directive handler table
int (*dirtab[])() = {
- d_org, // 0 org
- d_even, // 1 even
- d_unimpl, // 2 .6502
- d_68000, // 3 .68000
- d_bss, // 4 bss
- d_data, // 5 data
- d_text, // 6 text
- d_abs, // 7 abs
- d_comm, // 8 comm
- d_init, // 9 init
- d_cargs, // 10 cargs
- d_goto, // 11 goto
- d_dc, // 12 dc
- d_ds, // 13 ds
- d_undmac, // 14 undefmac
- d_gpu, // 15 .gpu
- d_dsp, // 16 .dsp
- d_dcb, // 17 dcb
- d_unimpl, // 18* set
- d_unimpl, // 19* reg
- d_unimpl, // 20 dump
- d_incbin, // 21 .incbin //load
- d_unimpl, // 22 disable
- d_unimpl, // 23 enable
- d_globl, // 24 globl
- d_regbank0, // 25 .regbank0
- d_regbank1, // 26 .regbank1
- d_unimpl, // 27 xdef
- d_assert, // 28 assert
- d_unimpl, // 29* if
- d_unimpl, // 30* endif
- d_unimpl, // 31* endc
- d_unimpl, // 32* iif
- d_include, // 33 include
- fpop, // 34 end
- d_unimpl, // 35* macro
- ExitMacro, // 36* exitm
- d_unimpl, // 37* endm
- d_list, // 38 list
- d_nlist, // 39 nlist
- d_long, // 40* rept
- d_phrase, // 41* endr
- d_dphrase, // 42 struct
- d_qphrase, // 43 ends
- d_title, // 44 title
- d_subttl, // 45 subttl
- eject, // 46 eject
- d_unimpl, // 47 error
- d_unimpl, // 48 warn
- d_noclear, // 49 .noclear
- d_equrundef, // 50 .equrundef/.regundef
- d_ccundef, // 51 .ccundef
- d_print, // 52 .print
- d_cstruct, // 53 .cstruct
+ d_org, // 0 org
+ d_even, // 1 even
+ d_unimpl, // 2 .6502
+ d_68000, // 3 .68000
+ d_bss, // 4 bss
+ d_data, // 5 data
+ d_text, // 6 text
+ d_abs, // 7 abs
+ d_comm, // 8 comm
+ d_init, // 9 init
+ d_cargs, // 10 cargs
+ d_goto, // 11 goto
+ d_dc, // 12 dc
+ d_ds, // 13 ds
+ d_undmac, // 14 undefmac
+ d_gpu, // 15 .gpu
+ d_dsp, // 16 .dsp
+ d_dcb, // 17 dcb
+ d_unimpl, // 18* set
+ d_unimpl, // 19* reg
+ d_unimpl, // 20 dump
+ d_incbin, // 21 .incbin //load
+ d_unimpl, // 22 disable
+ d_unimpl, // 23 enable
+ d_globl, // 24 globl
+ d_regbank0, // 25 .regbank0
+ d_regbank1, // 26 .regbank1
+ d_unimpl, // 27 xdef
+ d_assert, // 28 assert
+ d_unimpl, // 29* if
+ d_unimpl, // 30* endif
+ d_unimpl, // 31* endc
+ d_unimpl, // 32* iif
+ d_include, // 33 include
+ fpop, // 34 end
+ d_unimpl, // 35* macro
+ ExitMacro, // 36* exitm
+ d_unimpl, // 37* endm
+ d_list, // 38 list
+ d_nlist, // 39 nlist
+ d_long, // 40* rept
+ d_phrase, // 41* endr
+ d_dphrase, // 42 struct
+ d_qphrase, // 43 ends
+ d_title, // 44 title
+ d_subttl, // 45 subttl
+ eject, // 46 eject
+ d_unimpl, // 47 error
+ d_unimpl, // 48 warn
+ d_noclear, // 49 .noclear
+ d_equrundef, // 50 .equrundef/.regundef
+ d_ccundef, // 51 .ccundef
+ d_print, // 52 .print
+ d_cstruct, // 53 .cstruct
+ d_jpad, // 54 .jpad (deprecated)
+ d_nojpad, // 55 .nojpad (deprecated)
};
printf("%s", prntstr);
if (list_fd)
- write(list_fd, prntstr, (LONG)strlen(prntstr));
+ unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
tok += 2;
break;
printf("%s", prntstr);
if (list_fd)
- write(list_fd, prntstr, (LONG)strlen(prntstr));
+ unused = write(list_fd, prntstr, (LONG)strlen(prntstr));
formatting = 0;
wordlong = 0;
while (*tok != EOL)
{
- // Skip preceeding or seperating commas
+ // Skip preceeding or seperating commas (if any)
if (*tok == ',')
tok++;
//
int d_incbin(void)
{
- int i, j;
+ int fd;
int bytes = 0;
- long pos, size;
- char buf;
+ long pos, size, bytesRead;
+ char msg[256];
// Check to see if we're in BSS, and, if so, throw an error
if (scattr & SBSS)
{
- errors("Cannot include binary file \"%s\" in BSS section", string[tok[1]]);
+ errors("cannot include binary file \"%s\" in BSS section", string[tok[1]]);
return ERROR;
}
return ERROR;
}
-// if ((j = open((char *)tok[1], _OPEN_INC)) >= 0)
- if ((j = open(string[tok[1]], _OPEN_INC)) >= 0)
+ if ((fd = open(string[tok[1]], _OPEN_INC)) < 0)
{
- size = lseek(j, 0L, SEEK_END);
- chcheck(size);
- pos = lseek(j, 0L, SEEK_SET);
+ errors("cannot open include binary file (%s)", string[tok[1]]);
+ return ERROR;
+ }
- DEBUG
- {
- printf("INCBIN: File '%s' is %li bytes.\n", string[tok[1]], size);
- }
+ size = lseek(fd, 0L, SEEK_END);
+ pos = lseek(fd, 0L, SEEK_SET);
+ chcheck(size);
- for(i=0; i<size; i++)
- {
- buf = '\0';
- bytes = read(j, &buf, 1);
- D_byte(buf);
- }
- }
- else
+ 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)
{
-// errors("cannot open include binary file (%s)", (char *)tok[1]);
- errors("cannot open include binary file (%s)", string[tok[1]]);
+ sprintf(msg, "was only able to read %li bytes from binary file (%s, %li bytes)", bytesRead, string[tok[1]], size);
+ error(msg);
return ERROR;
}
- close(j);
+//#define D_byte(b) {*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
+ memcpy(chptr, fileBuffer, size);
+ chptr += size;
+ sloc += size;
+ ch_size += size;
+
+ if (orgactive)
+ orgaddr += size;
+
+ free(fileBuffer);
+ close(fd);
return 0;
}
//
int d_ds(WORD siz)
{
+if (verb_flag)
+ printf("Directive: .ds.[size] = %u, sloc = $%X\n", siz, sloc);
+
VALUE eval;
// This gets kind of stupid. This directive is disallowed in normal 68000
// In non-TDB section (BSS, ABS and M6502) just advance the location
// counter appropriately. In TDB sections, deposit (possibly large) chunks
//of zeroed memory....
- if ((scattr & SBSS))
+ if (scattr & SBSS)
{
listvalue(eval);
eval *= siz;
}
else
{
- dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED|ABS), NULL);
+ dep_block(eval, siz, (VALUE)0, (WORD)(DEFINED | ABS), NULL);
}
at_eol();
return 0;
}
+
+int d_jpad(void)
+{
+ warn("JPAD directive is deprecated/non-functional");
+ return OK;
+}
+
+
+int d_nojpad(void)
+{
+ warn("NOJPAD directive is deprecated/non-functional");
+ return OK;
+}
+