qf/quakeforge-old
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge-old synced 2024-11-24 21:01:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

Possible fix to gas2masm for VC++

Browse source
This commit is contained in:
Jeff Teunissen 2000-01-19 07:59:47 +00:00
parent 53982ecb8f
commit a2a7c92e25
1 changed files with 27 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
tools/gas2masm/gas2masm.c
View file

@ -33,7 +33,7 @@ typedef enum {NOT_WHITESPACE, WHITESPACE, TOKEN_AVAILABLE, LINE_DONE, FILE_DONE,
typedef enum {NOSEG, DATASEG, TEXTSEG} segtype; typedef enum {NOSEG, DATASEG, TEXTSEG} segtype;
int tokennum; int tokennum;
int inline, outline; int linein, lineout;
char *token; char *token;
char tokens[MAX_TOKENS][MAX_TOKEN_LENGTH+1]; char tokens[MAX_TOKENS][MAX_TOKEN_LENGTH+1];
@ -398,30 +398,34 @@ void emitonejumpdata (void)
{ {
int i, isaddr, len; int i, isaddr, len;
if (tokens[1][0] == '*') isaddr = 0;
{ len = strlen(tokens[1]);
printf (" dword ptr[%s]", &tokens[1][1]);
} if (tokens[1][0] == '*') {
else
{
isaddr = 0;
len = strlen(tokens[1]);
for (i=0 ; i<len ; i++) for (i=0 ; i<len ; i++) {
{ if (tokens[1][i] == '(') {
if (tokens[1][i] == '(') isaddr = 1;
{ break;
}
}
if ( !isaddr ) {
printf (" dword ptr [%s]", &tokens[1][1]);
} else {
emitanoperand (1, " dword ptr", 1);
}
} else {
for (i=0 ; i<len ; i++) {
if (tokens[1][i] == '(') {
isaddr = 1; isaddr = 1;
break; break;
} }
} }
if (!isaddr) if (!isaddr) {
{
printf (" %s", tokens[1]); printf (" %s", tokens[1]);
} } else {
else
{
emitanoperand (1, " dword ptr", 1); emitanoperand (1, " dword ptr", 1);
} }
} }
@ -430,7 +434,6 @@ void emitonejumpdata (void)
void emitexterndef (void) void emitexterndef (void)
{ {
printf (" %s:dword", tokens[1]); printf (" %s:dword", tokens[1]);
} }
@ -758,7 +761,7 @@ int numparse = sizeof (parsedata) / sizeof (parsedata[0]);
void errorexit (void) void errorexit (void)
{ {
fprintf (stderr, "In line: %d, out line: %d\n", inline, outline); fprintf (stderr, "In line: %d, out line: %d\n", linein, lineout);
exit (1); exit (1);
} }
@ -968,7 +971,7 @@ tokenstat parseline (void)
else else
printf ("\n"); printf ("\n");
outline++; lineout++;
} }
return PARSED_OKAY; return PARSED_OKAY;
@ -1025,13 +1028,13 @@ void main (int argc, char **argv)
printf (" .386P\n" printf (" .386P\n"
" .model FLAT\n"); " .model FLAT\n");
inline = 1; linein = 1;
outline = 3; lineout = 3;
for ( ;; ) for ( ;; )
{ {
stat = parseline (); stat = parseline ();
inline++; linein++;
switch (stat) switch (stat)
{ {