X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fasm.c;h=7455b69b3e6f91b7713eed8c39b0a69e6c6f7275;hb=e710a2ad169f8fa481a914f22be23c5ed09c22ab;hp=998e8f76f78a5ed6dd8657490b07aa5fe75b9dbd;hpb=7101cc7a320f90236345a21d826856dcfc360cf7;p=fw%2Fsdcc

diff --git a/src/asm.c b/src/asm.c
index 998e8f76..7455b69b 100644
--- a/src/asm.c
+++ b/src/asm.c
@@ -1,6 +1,18 @@
+/** @file asm.c
+    Provides output functions that modify the output string
+    based on the input tokens and the assembler token mapping
+    specification loaded.
+
+    Note that the functions below only handle digit format modifiers.
+    eg %02X is ok, but %lu and %.4u will fail.
+*/
 #include "common.h"
 #include "asm.h"
 
+/* A 'token' is like !blah or %24f and is under the programmers
+   control. */
+#define MAX_TOKEN_LEN		64
+
 static hTab *_h;
 
 static const char *_findMapping(const char *szKey)
@@ -8,10 +20,11 @@ static const char *_findMapping(const char *szKey)
     return shash_find(_h, szKey);
 }
 
-static va_list _iprintf(char *pInto, const char *szFormat, va_list ap)
+static va_list _iprintf(char *pInto, const char *sz, va_list ap)
 {
+    char format[MAX_TOKEN_LEN];
     char *pStart = pInto;
-    char *sz = gc_strdup(szFormat);
+    static int count;
 
     while (*sz) {
 	if (*sz == '%') {
@@ -20,19 +33,34 @@ static va_list _iprintf(char *pInto, const char *szFormat, va_list ap)
 	    case 'r':
 		wassert(0);
 		break;
+	    /* Name of the code segment */
+	    case 'C':
+		strcpy(pInto, CODE_NAME);
+		pInto = pStart + strlen(pStart);
+		sz++;
+		break;
+	    case 'F':
+		strcpy(pInto, srcFileName);
+		pInto = pStart + strlen(pStart);	
+		sz++;
+		break;
+	    case 'I':
+		sprintf(pInto, "%u", ++count);
+		pInto = pStart + strlen(pStart);
+		sz++;
+		break;
 	    default:
 		{
 		    /* Scan out the arg and pass it on to sprintf */
-		    char *p = sz-1, tmp;
+		    char *p = format;
+		    *p++ = '%';
 		    while (isdigit(*sz))
-			sz++;
-		    /* Skip the format */
-		    tmp = *++sz;
-		    *sz = '\0';
-		    vsprintf(pInto, p, ap);
+			*p++ = *sz++;
+		    *p++ = *sz++;
+		    *p = '\0';
+		    vsprintf(pInto, format, ap);
 		    /* PENDING: Assume that the arg length was an int */
-		    va_arg(ap, int);
-		    *sz = tmp;
+		    (void)va_arg(ap, int);
 		}
 	    }
 	    pInto = pStart + strlen(pStart);
@@ -46,10 +74,11 @@ static va_list _iprintf(char *pInto, const char *szFormat, va_list ap)
     return ap;
 }
 
-void tvsprintf(char *buffer, const char *szFormat, va_list ap)
+void tvsprintf(char *buffer, const char *sz, va_list ap)
 {
-    char *sz = gc_strdup(szFormat);
-    char *pInto = buffer, *p;
+    char *pInto = buffer;
+    char *p;
+    char token[MAX_TOKEN_LEN];
 
     buffer[0] = '\0';
     
@@ -57,38 +86,34 @@ void tvsprintf(char *buffer, const char *szFormat, va_list ap)
 	if (*sz == '!') {
 	    /* Start of a token.  Search until the first
 	       [non alplha, *] and call it a token. */
-	    char old;
 	    const char *t;
-	    p = ++sz;
+	    p = token;
+	    sz++;
 	    while (isalpha(*sz) || *sz == '*') {
-		sz++;
+		*p++ = *sz++;
 	    }
-	    old = *sz;
-	    *sz = '\0';
+	    *p = '\0';
 	    /* Now find the token in the token list */
-	    if ((t = _findMapping(p))) {
+	    if ((t = _findMapping(token))) {
 		ap = _iprintf(pInto, t, ap);
 		pInto = buffer + strlen(buffer);
 	    }
 	    else {
-		fprintf(stderr, "Cant find token \"%s\"\n", p);
+		fprintf(stderr, "Cant find token \"%s\"\n", token);
 		wassert(0);
 	    }
-	    *sz = old;
 	}
 	else if (*sz == '%') {
-	    char *pFormat = sz;
-	    char old;
-	    sz++;
-	    while (!isalpha(*sz))
-		sz++;
-	    sz++;
-	    old = *sz;
-	    *sz = '\0';
-	    vsprintf(pInto, pFormat, ap);
+	    p = token;
+	    *p++ = *sz++;
+	    while (!isalpha(*sz)) {
+		*p++ = *sz++;
+	    }
+	    *p++ = *sz++;
+	    *p = '\0';
+	    vsprintf(pInto, token, ap);
 	    pInto = buffer + strlen(buffer);
-	    *sz = old;
-	    va_arg(ap, int);
+	    (void)va_arg(ap, int);
 	}
 	else {
 	    *pInto++ = *sz++;
@@ -129,6 +154,7 @@ void asm_addTree(const ASM_MAPPINGS *pMappings)
 
 static const ASM_MAPPING _asxxxx_mapping[] = {
     { "labeldef", "%s::" },
+    { "slabeldef", "%s:" },
     { "tlabeldef", "%05d$:" },
     { "tlabel", "%05d$" },
     { "immed", "#" },
@@ -137,11 +163,12 @@ static const ASM_MAPPING _asxxxx_mapping[] = {
     { "area", ".area %s" },
     { "areacode", ".area %s" },
     { "areadata", ".area %s" },
+    { "areahome", ".area %s" },
     { "ascii", ".ascii \"%s\"" },
     { "ds", ".ds %d" },
-    { "db", ".db %d" },
+    { "db", ".db" },
     { "dbs", ".db %s" },
-    { "dw", ".dw %d" },
+    { "dw", ".dw" },
     { "dws", ".dw %s" },
     { "constbyte", "0x%02X" },
     { "constword", "0x%04X" },
@@ -159,6 +186,7 @@ static const ASM_MAPPING _asxxxx_mapping[] = {
       "; ---------------------------------"
     },
     { "functionlabeldef", "%s:" },
+    { "bankimmeds", "0	; PENDING: bank support" },
     { NULL, NULL }
 };