Remember more function infos in the Function struct.

git-svn-id: svn://svn.cc65.org/cc65/trunk@4104 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/src/cc65/function.c b/src/cc65/function.c
index 7e2e9145f3a14754397be1129b713d2bed11fdfc..44c7bbe9ef97de291c848ca2d2b35e15127b7232 100644 (file)
--- a/src/cc65/function.c
+++ b/src/cc65/function.c
@@ -62,16 +62,24 @@
 
 
 
+/* Enumeration for function flags */
+typedef enum {
+    FF_NONE             = 0x0000,
+    FF_HAS_RETURN       = 0x0001,       /* Function has a return statement */
+    FF_IS_MAIN          = 0x0002,       /* This is the main function */
+    FF_VOID_RETURN      = 0x0004,       /* Function returning void */
+} funcflags_t;
+
 /* Structure that holds all data needed for function activation */
 struct Function {
     struct SymEntry*           FuncEntry;      /* Symbol table entry */
-    Type*              ReturnType;     /* Function return type */
+    Type*              ReturnType;     /* Function return type */
     struct FuncDesc*   Desc;           /* Function descriptor */
-    int                        Reserved;       /* Reserved local space */
-    unsigned           RetLab;         /* Return code label */
-    int                        TopLevelSP;     /* SP at function top level */
+    int                        Reserved;       /* Reserved local space */
+    unsigned           RetLab;         /* Return code label */
+    int                        TopLevelSP;     /* SP at function top level */
     unsigned            RegOffs;        /* Register variable space offset */
-    int                 HasRetStmt;     /* Function has a return statement */
+    funcflags_t                Flags;          /* Function flags */
 };
 
 /* Pointer to current function */
@@ -99,7 +107,7 @@ static Function* NewFunction (struct SymEntry* Sym)
     F->RetLab    = GetLocalLabel ();
     F->TopLevelSP = 0;
     F->RegOffs    = RegisterSpace;
-    F->HasRetStmt = 0;
+    F->Flags     = IsTypeVoid (F->ReturnType) ? FF_VOID_RETURN : FF_NONE;
 
     /* Return the new structure */
     return F;
@@ -150,15 +158,31 @@ Type* F_GetReturnType (Function* F)
 int F_HasVoidReturn (const Function* F)
 /* Return true if the function does not have a return value */
 {
-    return IsTypeVoid (F->ReturnType);
+    return (F->Flags & FF_VOID_RETURN) != 0;
 }
 
 
 
-void F_HasReturn (Function* F)
+void F_ReturnFound (Function* F)
 /* Mark the function as having a return statement */
 {
-    F->HasRetStmt = 1;
+    F->Flags |= FF_HAS_RETURN;
+}
+
+
+
+int F_HasReturn (const Function* F)
+/* Return true if the function contains a return statement*/
+{
+    return (F->Flags & FF_HAS_RETURN) != 0;
+}
+
+
+
+int F_IsMainFunc (const Function* F)
+/* Return true if this is the main function */
+{
+    return (F->Flags & FF_IS_MAIN) != 0;
 }
 
 
@@ -375,6 +399,10 @@ void NewFunc (SymEntry* Func)
 
     /* Special handling for main() */
     if (strcmp (Func->Name, "main") == 0) {
+
+        /* Mark this as the main function */
+        CurrentFunc->Flags |= FF_IS_MAIN;
+
         /* Main cannot be a fastcall function */
         if (IsQualFastcall (Func->Type)) {
             Error ("`main' cannot be declared as __fastcall__");
@@ -456,7 +484,6 @@ void NewFunc (SymEntry* Func)
 
                 /* Generate swap code */
                 g_swap_regvars (Param->V.R.SaveOffs, Reg, CheckedSizeOf (Param->Type));
-
             }
         }
 
@@ -483,7 +510,7 @@ void NewFunc (SymEntry* Func)
     /* If this is not a void function, output a warning if we didn't see a
      * return statement.
      */
-    if (!F_HasVoidReturn (CurrentFunc) && !CurrentFunc->HasRetStmt) {
+    if (!F_HasVoidReturn (CurrentFunc) && !F_HasReturn (CurrentFunc)) {
         Warning ("Control reaches end of non-void function");
     }
 

diff --git a/src/cc65/function.h b/src/cc65/function.h
index d827cba6af9104d9e40318de3f3e323c1c20f4d9..de9fdc123edba387b6362a824ee147a27819f01f 100644 (file)
--- a/src/cc65/function.h
+++ b/src/cc65/function.h
@@ -73,9 +73,12 @@ Type* F_GetReturnType (Function* F);
 int F_HasVoidReturn (const Function* F);
 /* Return true if the function does not have a return value */
 
-void F_HasReturn (Function* F);
+void F_ReturnFound (Function* F);
 /* Mark the function as having a return statement */
 
+int F_HasReturn (const Function* F);
+/* Return true if the function contains a return statement*/
+
 int F_IsVariadic (const Function* F);
 /* Return true if this is a variadic function */
 

diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c
index b9b258aa09e365741b5263cf3d1e24d9e1715dfe..11ceadc4c5f4c19ecb4972a67a5d1f86c262262d 100644 (file)
--- a/src/cc65/stmt.c
+++ b/src/cc65/stmt.c
@@ -314,7 +314,7 @@ static void ReturnStatement (void)
     }
 
     /* Mark the function as having a return statement */
-    F_HasReturn (CurrentFunc);
+    F_ReturnFound (CurrentFunc);
 
     /* Cleanup the stack in case we're inside a block with locals */
     g_space (StackPtr - F_GetTopLevelSP (CurrentFunc));