augusto
/
hack-assembler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add instruction limit check

This commit is contained in:
Augusto Gunsch 2020-10-25 10:27:15 -03:00
parent d758eaff6a
commit ce18f46910
No known key found for this signature in database
GPG Key ID: F7EEFE29825C72DC
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
assembler.c
View File

@ -7,9 +7,10 @@
#define RAM_LIMIT 24577 #define RAM_LIMIT 24577
#define TOP_VAR 16383 #define TOP_VAR 16383
#define BOT_VAR 16 #define BOT_VAR 16
#define ADD_STR_LEN 7 #define ADD_STR_SIZE 7
#define INST_SIZE 17 #define INST_SIZE 17
#define C_TOKEN_SIZE 4 #define C_TOKEN_SIZE 4
#define INST_LIMIT 32768
#define CMP_SIZE 8 #define CMP_SIZE 8
#define CMP_TABLE_SIZE 27 #define CMP_TABLE_SIZE 27
@ -183,13 +184,20 @@ void populatevars(struct symbol** vars, int* varscount) {
void gatherinfo(FILE* input, int* lnscount, int* labelscount, int* maxwidth) { void gatherinfo(FILE* input, int* lnscount, int* labelscount, int* maxwidth) {
char c; char c;
unsigned char readsmt = 0; unsigned char readsmt = 0;
int truelnscount = 1;
int lnwidth = 1; int lnwidth = 1;
while(c = fgetc(input), c != -1) { while(c = fgetc(input), c != -1) {
if(c == '\n') { if(c == '\n') {
truelnscount++;
if(lnwidth > *maxwidth) if(lnwidth > *maxwidth)
*maxwidth = lnwidth; *maxwidth = lnwidth;
if(readsmt) if(readsmt) {
if(*lnscount == INST_LIMIT) {
fprintf(stderr, "Reached instruction limit (%i); line %i\n", INST_LIMIT, truelnscount);
exit(1);
}
(*lnscount)++; (*lnscount)++;
}
readsmt = 0; readsmt = 0;
lnwidth = 1; lnwidth = 1;
continue; continue;
@ -202,6 +210,7 @@ void gatherinfo(FILE* input, int* lnscount, int* labelscount, int* maxwidth) {
char nc = fgetc(input); char nc = fgetc(input);
if(nc == '/') { if(nc == '/') {
skipln(input); skipln(input);
truelnscount++;
continue; continue;
} }
ungetc(nc, input); ungetc(nc, input);
@ -336,8 +345,8 @@ int chop(FILE* input, struct symbol** vars, int varscount, struct symbol** label
void replacevar(struct line* ln, int val) { void replacevar(struct line* ln, int val) {
free(ln->ln); free(ln->ln);
char* newln = (char *)malloc(sizeof(char)*ADD_STR_LEN); char* newln = (char *)malloc(sizeof(char)*ADD_STR_SIZE);
snprintf(newln, ADD_STR_LEN, "@%i", val); snprintf(newln, ADD_STR_SIZE, "@%i", val);
ln->ln = newln; ln->ln = newln;
} }