projects
/
dcpu16
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
46ffc28
)
minor cleanup of verbosity
author
Justin Wind
<justin.wind@gmail.com>
Wed, 18 Apr 2012 03:03:47 +0000
(20:03 -0700)
committer
Justin Wind
<justin.wind@gmail.com>
Wed, 18 Apr 2012 03:03:47 +0000
(20:03 -0700)
as-dcpu16.c
patch
|
blob
|
history
diff --git
a/as-dcpu16.c
b/as-dcpu16.c
index 2d131d7a40a167c37ee5115543aba21f9f73e8f6..063741d51a8698330c3a8af13d12c33a03114d11 100644
(file)
--- a/
as-dcpu16.c
+++ b/
as-dcpu16.c
@@
-597,13
+597,9
@@
int tokenize_line_(char *line, struct instruction_ **next_instr) {
struct operand_ *new_operand;
char *y;
struct operand_ *new_operand;
char *y;
- DEBUG_PRINTF("considering operand '%s'\n", x);
-
/* trim whitespaces */
x += strspn(x, whitespace);
/* trim whitespaces */
x += strspn(x, whitespace);
- DEBUG_PRINTF("considering ftrim operand '%s'\n", x);
-
if (*x) {
for (y = x + strlen(x) - 1; *y; y--) {
if (strchr(whitespace, *y)) {
if (*x) {
for (y = x + strlen(x) - 1; *y; y--) {
if (strchr(whitespace, *y)) {
@@
-613,11
+609,11
@@
int tokenize_line_(char *line, struct instruction_ **next_instr) {
}
/* nothing left? */
if (*x == '\0') {
}
/* nothing left? */
if (*x == '\0') {
- fprintf(stderr, "
ignoring null operand in line %zu\n", instr->src_line
);
-
continue
;
+ fprintf(stderr, "
null operand encountered\n"
);
+
return -1
;
}
}
- DEBUG_PRINTF("
foun
d operand '%s'\n", x);
+ DEBUG_PRINTF("
tokenize
d operand '%s'\n", x);
new_operand = malloc(sizeof *new_operand);
if (new_operand == NULL) {
new_operand = malloc(sizeof *new_operand);
if (new_operand == NULL) {
@@
-644,7
+640,7
@@
int tokenize_line_(char *line, struct instruction_ **next_instr) {
}
}
}
}
- DEBUG_PRINTF("allocating instruction with room for %zu bytes\n", instr_words_needed);
+ DEBUG_PRINTF("allocating
new
instruction with room for %zu bytes\n", instr_words_needed);
instr = calloc(1, (instr_words_needed * sizeof *instr->instr_words) + sizeof *instr);
if (instr == NULL) {
instr = calloc(1, (instr_words_needed * sizeof *instr->instr_words) + sizeof *instr);
if (instr == NULL) {
@@
-1092,9
+1088,9
@@
int main(int argc, char *argv[]) {
VERBOSE_PRINTF("assembling '%s'...\n", filename);
c = parse_stream_(f, filename, instructionps_, labels_, allow_short_labels);
VERBOSE_PRINTF("assembling '%s'...\n", filename);
c = parse_stream_(f, filename, instructionps_, labels_, allow_short_labels);
+ fclose(f);
if (c)
break;
if (c)
break;
- fclose(f);
}
} else {
VERBOSE_PRINTF("assembling '%s'...\n", "stdin");
}
} else {
VERBOSE_PRINTF("assembling '%s'...\n", "stdin");