projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* src/SDCCcse.c (findCheaperOp): fixed bug 1376320, copy signedness to replacing...
[fw/sdcc]
/
as
/
z80
/
asmain.c
diff --git
a/as/z80/asmain.c
b/as/z80/asmain.c
index 5f6d6a1ca399b4c002755d479e7d7766af95af92..72c5b98958e12a1925025331a0ef67f60820afd1 100644
(file)
--- a/
as/z80/asmain.c
+++ b/
as/z80/asmain.c
@@
-17,16
+17,13
@@
#include <setjmp.h>
#include <string.h>
#include <setjmp.h>
#include <string.h>
-//#if !defined(_MSC_VER)
-//#include <alloc.h>
-//#endif
-
#ifdef SDK
#include <stdlib.h>
#include <math.h>
#undef HUGE
#endif
#include "asm.h"
#ifdef SDK
#include <stdlib.h>
#include <math.h>
#undef HUGE
#endif
#include "asm.h"
+#include "z80.h"
/*)Module asmain.c
*
/*)Module asmain.c
*
@@
-163,6
+160,21
@@
main(int argc, char **argv)
register int c, i;
struct area *ap;
register int c, i;
struct area *ap;
+ /* Check to make sure there are the right number of filenames */
+ /* before openning any of them */
+#ifdef SDK
+ inpfil = -2;
+#else /* SDK */
+ inpfil = -1;
+#endif /* SDK */
+ for (i=1; i<argc; ++i) {
+ p = argv[i];
+ if (*p != '-')
+ inpfil++;
+ }
+ if (inpfil < 0)
+ usage();
+
#ifdef SDK
inpfil = -2;
#else /* SDK */
#ifdef SDK
inpfil = -2;
#else /* SDK */
@@
-446,7
+458,7
@@
int i;
* char getnb() aslex.c
* VOID getst() aslex.c
* sym * lookup() assym.c
* char getnb() aslex.c
* VOID getst() aslex.c
* sym * lookup() assym.c
- * VOID machin
()
___mch.c
+ * VOID machin
e()
___mch.c
* mne * mlookup() assym.c
* int more() aslex.c
* VOID * new() assym.c
* mne * mlookup() assym.c
* int more() aslex.c
* VOID * new() assym.c
@@
-559,12
+571,13
@@
loop:
* symbol, assembler directive, or assembler mnemonic is
* being processed.
*/
* symbol, assembler directive, or assembler mnemonic is
* being processed.
*/
- if ((ctype[c] & LETTER) == 0)
- if (flevel) {
- return;
- } else {
+ if ((ctype[c] & LETTER) == 0)
{
+ if (flevel) {
+
return;
+
} else {
qerr();
}
qerr();
}
+ }
getid(id, c);
c = getnb();
/*
getid(id, c);
c = getnb();
/*
@@
-759,9
+772,9
@@
loop:
{
f2 = floor(log(fabs(f1))/log(2))+1;
{
f2 = floor(log(fabs(f1))/log(2))+1;
- mantissa = (
0x1000000*fabs(f1))/exp(f2*log(2))
;
+ mantissa = (
unsigned int) ((0x1000000*fabs(f1))/exp(f2*log(2)))
;
mantissa &=0xffffff;
mantissa &=0xffffff;
- exponent =
f2 + 0x40
;
+ exponent =
(unsigned int) (f2 + 0x40)
;
if (f1<0)
exponent |=0x80;
}
if (f1<0)
exponent |=0x80;
}
@@
-841,7
+854,7
@@
loop:
break;
case S_MODUL:
break;
case S_MODUL:
- getst(id,
-1);
+ getst(id,
getnb()); // a module can start with a digit
if (pass == 0) {
if (module[0]) {
err('m');
if (pass == 0) {
if (module[0]) {
err('m');
@@
-852,6
+865,19
@@
loop:
lmode = SLIST;
break;
lmode = SLIST;
break;
+ case S_OPTSDCC:
+ p = optsdcc;
+ if ((c = getnb()) != 0) {
+ do {
+ if (p < &optsdcc[NINPUT-1])
+ *p++ = c;
+ } while ((c = get()) != 0);
+ }
+ *p = 0;
+ unget(c);
+ lmode = SLIST;
+ break;
+
case S_GLOBL:
do {
getid(id, -1);
case S_GLOBL:
do {
getid(id, -1);
@@
-1026,30
+1052,36
@@
char *fn;
char *ft;
int wf;
{
char *ft;
int wf;
{
- register char *p
1, *p
2, *p3;
+ register char *p2, *p3;
register int c;
FILE *fp;
register int c;
FILE *fp;
- p1 = fn;
p2 = afn;
p3 = ft;
p2 = afn;
p3 = ft;
- while ((c = *p1++) != 0 && c != FSEPX) {
- if (p2 < &afn[FILSPC-4])
- *p2++ = c;
- }
+
+ strcpy (afn, fn);
+ p2 = strrchr (afn, FSEPX); // search last '.'
+ if (!p2)
+ p2 = afn + strlen (afn);
+ if (p2 > &afn[FILSPC-4]) // truncate filename, if it's too long
+ p2 = &afn[FILSPC-4];
*p2++ = FSEPX;
*p2++ = FSEPX;
- if (*p3 == 0) {
- if (c == FSEPX) {
- p3 = p1;
- } else {
- p3 = dsft;
- }
+
+ // choose a file-extension
+ if (*p3 == 0) { // extension supplied?
+ p3 = strrchr (fn, FSEPX); // no: extension in fn?
+ if (p3)
+ ++p3;
+ else
+ p3 = dsft; // no: default extension
}
}
- while ((c = *p3++) != 0) {
+
+ while ((c = *p3++) != 0) { // strncpy
if (p2 < &afn[FILSPC-1])
*p2++ = c;
}
*p2++ = 0;
if (p2 < &afn[FILSPC-1])
*p2++ = c;
}
*p2++ = 0;
+
if ((fp = fopen(afn, wf?"w":"r")) == NULL) {
fprintf(stderr, "%s: cannot %s.\n", afn, wf?"create":"open");
asexit(1);
if ((fp = fopen(afn, wf?"w":"r")) == NULL) {
fprintf(stderr, "%s: cannot %s.\n", afn, wf?"create":"open");
asexit(1);