Fixed two compiler warnings.

[cc65] / src / cc65 / function.c

diff --git a/src/cc65/function.c b/src/cc65/function.c
index 44c7bbe9ef97de291c848ca2d2b35e15127b7232..7c9e52cbb936f728afecef64d12d32e3d8df3a06 100644 (file)
--- a/src/cc65/function.c
+++ b/src/cc65/function.c
@@ -6,7 +6,7 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 2000-2009, Ullrich von Bassewitz                                      */
+/* (C) 2000-2011, Ullrich von Bassewitz                                      */
 /*                Roemerstrasse 52                                           */
 /*                D-70794 Filderstadt                                        */
 /* EMail:         uz@cc65.org                                                */
@@ -47,7 +47,6 @@
 #include "litpool.h"
 #include "locals.h"
 #include "scanner.h"
-#include "segments.h"
 #include "stackptr.h"
 #include "standard.h"
 #include "stmt.h"
@@ -74,7 +73,7 @@ typedef enum {
 struct Function {
     struct SymEntry*           FuncEntry;      /* Symbol table entry */
     Type*              ReturnType;     /* Function return type */
-    struct FuncDesc*   Desc;           /* Function descriptor */
+    FuncDesc*                  Desc;           /* Function descriptor */
     int                        Reserved;       /* Reserved local space */
     unsigned           RetLab;         /* Return code label */
     int                        TopLevelSP;     /* SP at function top level */
@@ -360,8 +359,25 @@ static void F_RestoreRegVars (Function* F)
 
 
 
+static void F_EmitDebugInfo (void)
+/* Emit debug infos for the current function */
+{                   
+    if (DebugInfo) {
+        /* Get the current fuction */
+        const SymEntry* Sym = CurrentFunc->FuncEntry;
+
+        /* Output info for the function itself */
+        AddTextLine ("\t.dbg\tfunc, \"%s\", \"00\", %s, \"%s\"",
+                     Sym->Name,
+                     (Sym->Flags & SC_EXTERN)? "extern" : "static",
+                     Sym->AsmName);
+    }
+}
+
+
+
 /*****************************************************************************/
-/*                                          code                                    */
+/*                                          code                                    */
 /*****************************************************************************/
 
 
@@ -369,7 +385,8 @@ static void F_RestoreRegVars (Function* F)
 void NewFunc (SymEntry* Func)
 /* Parse argument declarations and function body. */
 {
-    SymEntry* Param;
+    int         C99MainFunc = 0;/* Flag for C99 main function returning int */
+    SymEntry*   Param;
 
     /* Get the function descriptor from the function entry */
     FuncDesc* D = Func->V.F.Func;
@@ -380,17 +397,24 @@ void NewFunc (SymEntry* Func)
     /* Reenter the lexical level */
     ReenterFunctionLevel (D);
 
+    /* Check if the function header contains unnamed parameters. These are
+     * only allowed in cc65 mode.
+     */
+    if ((D->Flags & FD_UNNAMED_PARAMS) != 0 && (IS_Get (&Standard) != STD_CC65)) {
+        Error ("Parameter name omitted");
+    }
+
     /* Declare two special functions symbols: __fixargs__ and __argsize__.
      * The latter is different depending on the type of the function (variadic
      * or not).
      */
     AddConstSym ("__fixargs__", type_uint, SC_DEF | SC_CONST, D->ParamSize);
     if (D->Flags & FD_VARIADIC) {
-       /* Variadic function. The variable must be const. */
-       static const Type T[] = { TYPE(T_UCHAR | T_QUAL_CONST), TYPE(T_END) };
-       AddLocalSym ("__argsize__", T, SC_DEF | SC_REF | SC_AUTO, 0);
+       /* Variadic function. The variable must be const. */
+       static const Type T[] = { TYPE(T_UCHAR | T_QUAL_CONST), TYPE(T_END) };
+       AddLocalSym ("__argsize__", T, SC_DEF | SC_REF | SC_AUTO, 0);
     } else {
-       /* Non variadic */
+       /* Non variadic */
                AddConstSym ("__argsize__", type_uchar, SC_DEF | SC_CONST, D->ParamSize);
     }
 
@@ -427,21 +451,32 @@ void NewFunc (SymEntry* Func)
         if (D->ParamCount > 0 || (D->Flags & FD_VARIADIC) != 0) {
             g_importmainargs ();
         }
+
+        /* Determine if this is a main function in a C99 environment that
+         * returns an int.
+         */
+        if (IsTypeInt (F_GetReturnType (CurrentFunc)) &&
+            IS_Get (&Standard) == STD_C99) {
+            C99MainFunc = 1;
+        }
     }
 
     /* Allocate code and data segments for this function */
     Func->V.F.Seg = PushSegments (Func);
 
+    /* Allocate a new literal pool */
+    PushLiteralPool (Func);
+
     /* If this is a fastcall function, push the last parameter onto the stack */
     if (IsQualFastcall (Func->Type) && D->ParamCount > 0) {
 
-       unsigned Flags;
+       unsigned Flags;
 
-       /* Fastcall functions may never have an ellipsis or the compiler is buggy */
-       CHECK ((D->Flags & FD_VARIADIC) == 0);
+       /* Fastcall functions may never have an ellipsis or the compiler is buggy */
+       CHECK ((D->Flags & FD_VARIADIC) == 0);
 
-       /* Generate the push */
-       if (IsTypeFunc (D->LastParam->Type)) {
+       /* Generate the push */
+       if (IsTypeFunc (D->LastParam->Type)) {
            /* Pointer to function */
            Flags = CF_PTR;
        } else {
@@ -507,13 +542,23 @@ void NewFunc (SymEntry* Func)
         Statement (0);
     }
 
-    /* If this is not a void function, output a warning if we didn't see a
-     * return statement.
+    /* If this is not a void function, and not the main function in a C99
+     * environment returning int, output a warning if we didn't see a return
+     * statement.
      */
-    if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc)) {
+    if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc) && !C99MainFunc) {
         Warning ("Control reaches end of non-void function");
     }
 
+    /* If this is the main function in a C99 environment returning an int, let
+     * it always return zero. Note: Actual return statements jump to the return
+     * label defined below.
+     * The code is removed by the optimizer if unused.
+     */
+    if (C99MainFunc) {
+        g_getimmed (CF_INT | CF_CONST, 0, 0);
+    }
+
     /* Output the function exit code label */
     g_defcodelabel (F_GetRetLab (CurrentFunc));
 
@@ -526,12 +571,19 @@ void NewFunc (SymEntry* Func)
     /* Emit references to imports/exports */
     EmitExternals ();
 
+    /* Emit function debug info */
+    F_EmitDebugInfo ();
+    EmitDebugInfo ();
+
     /* Leave the lexical level */
     LeaveFunctionLevel ();
 
     /* Eat the closing brace */
     ConsumeRCurly ();
 
+    /* Restore the old literal pool, remembering the one for the function */
+    Func->V.F.LitPool = PopLiteralPool ();
+
     /* Switch back to the old segments */
     PopSegments ();