Fixed two compiler warnings.

[cc65] / src / cc65 / compile.c

diff --git a/src/cc65/compile.c b/src/cc65/compile.c
index 1a7862cf598d708227e2fe193f4e2c596f032ae6..d7167706b21de9ca4ec2e9ba05944fe201ee3c29 100644 (file)
--- a/src/cc65/compile.c
+++ b/src/cc65/compile.c
@@ -91,10 +91,13 @@ static void Parse (void)
            continue;
        }
 
-       /* Check for an ASM statement (which is allowed also on global level) */
+               /* Disallow ASM statements on global level */
        if (CurTok.Tok == TOK_ASM) {
+            Error ("__asm__ is not allowed here");                 
+            /* Parse and remove the statement for error recovery */
            AsmStatement ();
            ConsumeSemi ();
+            RemoveGlobalCode ();
            continue;
        }
 
@@ -138,15 +141,20 @@ static void Parse (void)
            }
 
             /* Check if we must reserve storage for the variable. We do this,
-             * if it is not a typedef or function, if we don't had a storage
-             * class given ("int i") or if the storage class is explicitly
-             * specified as static. This means that "extern int i" will not
-             * get storage allocated.
+             *
+             *   - if it is not a typedef or function,
+             *   - if we don't had a storage class given ("int i")
+             *   - if the storage class is explicitly specified as static,
+             *   - or if there is an initialization.
+             *
+             * This means that "extern int i;" will not get storage allocated.
              */
            if ((Decl.StorageClass & SC_FUNC) != SC_FUNC          &&
                 (Decl.StorageClass & SC_TYPEDEF) != SC_TYPEDEF    &&
-                ((Spec.Flags & DS_DEF_STORAGE) != 0  ||
-                 (Decl.StorageClass & (SC_STATIC | SC_EXTERN)) == SC_STATIC)) {
+                ((Spec.Flags & DS_DEF_STORAGE) != 0         ||
+                 (Decl.StorageClass & (SC_EXTERN|SC_STATIC)) == SC_STATIC ||
+                 ((Decl.StorageClass & SC_EXTERN) != 0 &&
+                  CurTok.Tok == TOK_ASSIGN))) {
 
                 /* We will allocate storage */
                Decl.StorageClass |= SC_STORAGE | SC_DEF;
@@ -392,7 +400,7 @@ void Compile (const char* FileName)
 
 
 void FinishCompile (void)
-/* Emit literals, externals, do cleanup and optimizations */
+/* Emit literals, externals, debug info, do cleanup and optimizations */
 {
     SymTable* SymTab;
     SymEntry* Func;
@@ -413,6 +421,9 @@ void FinishCompile (void)
     /* Output the literal pool */
     OutputLiteralPool ();
 
+    /* Emit debug infos if enabled */
+    EmitDebugInfo ();
+
     /* Write imported/exported symbols */
     EmitExternals ();