Merge remote-tracking branch 'upstream/master' into a5200

[cc65] / src / common / addrsize.c

diff --git a/src/common/addrsize.c b/src/common/addrsize.c
index a316801263770aeb1c06cb48cd19e52f447f543a..faa150b1dd6f1a282ed832821699e269e87efefd 100644 (file)
--- a/src/common/addrsize.c
+++ b/src/common/addrsize.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2003      Ullrich von Bassewitz                                       */
-/*               Römerstraße 52                                              */
-/*               D-70794 Filderstadt                                         */
-/* EMail:        uz@cc65.org                                                 */
+/* (C) 2003-2009, Ullrich von Bassewitz                                      */
+/*                Roemerstrasse 52                                           */
+/*                D-70794 Filderstadt                                        */
+/* EMail:         uz@cc65.org                                                */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -35,11 +35,12 @@
 
 /* common */
 #include "addrsize.h"
+#include "strutil.h"
 
 
 
 /*****************************************************************************/
-/*                                          Code                                    */
+/*                                   Code                                    */
 /*****************************************************************************/
 
 
@@ -58,4 +59,36 @@ const char* AddrSizeToStr (unsigned char AddrSize)
 }
 
 
-                                                    
+
+unsigned char AddrSizeFromStr (const char* Str)
+/* Return the address size for a given string. Returns ADDR_SIZE_INVALID if
+ * the string cannot be mapped to an address size.
+ */
+{
+    static const struct {
+        const char*     Name;
+        unsigned char   AddrSize;
+    } AddrSizeTable[] = {
+        { "abs",        ADDR_SIZE_ABS     },
+        { "absolute",   ADDR_SIZE_ABS     },
+        { "default",    ADDR_SIZE_DEFAULT },
+        { "direct",     ADDR_SIZE_ZP      },
+        { "dword",      ADDR_SIZE_LONG    },
+        { "far",        ADDR_SIZE_FAR     },
+        { "long",       ADDR_SIZE_LONG    },
+        { "near",       ADDR_SIZE_ABS     },
+        { "zeropage",   ADDR_SIZE_ZP      },
+        { "zp",         ADDR_SIZE_ZP      },
+    };
+    unsigned I;
+
+    for (I = 0; I < sizeof (AddrSizeTable) / sizeof (AddrSizeTable[0]); ++I) {
+        if (StrCaseCmp (Str, AddrSizeTable[I].Name) == 0) {
+            /* Found */
+            return AddrSizeTable[I].AddrSize;
+        }
+    }
+
+    /* Not found */
+    return ADDR_SIZE_INVALID;
+}