X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fcc65%2Fstmt.c;h=77b39859d1775972f743138e40e48946c9c9f4b1;hb=b3496bb343a2c93284a8669da4b52cf45b3db3dd;hp=bcf12b30f4f52ee160b274ae23aa4becffc0a445;hpb=cc83744882b694fd42c8ce1b9da075f5d1e9ba1b;p=cc65 diff --git a/src/cc65/stmt.c b/src/cc65/stmt.c index bcf12b30f..77b39859d 100644 --- a/src/cc65/stmt.c +++ b/src/cc65/stmt.c @@ -1,10 +1,35 @@ -/* - * stmt.c - * - * Ullrich von Bassewitz, 06.08.1998 - * - * Original by John R. Dunning - see copyleft.jrd - */ +/*****************************************************************************/ +/* */ +/* stmt.c */ +/* */ +/* Parse a statement */ +/* */ +/* */ +/* */ +/* (C) 1998-2003 Ullrich von Bassewitz */ +/* Wacholderweg 14 */ +/* D-70597 Stuttgart */ +/* EMail: uz@cc65.org */ +/* */ +/* */ +/* This software is provided 'as-is', without any expressed or implied */ +/* warranty. In no event will the authors be held liable for any damages */ +/* arising from the use of this software. */ +/* */ +/* Permission is granted to anyone to use this software for any purpose, */ +/* including commercial applications, and to alter it and redistribute it */ +/* freely, subject to the following restrictions: */ +/* */ +/* 1. The origin of this software must not be misrepresented; you must not */ +/* claim that you wrote the original software. If you use this software */ +/* in a product, an acknowledgment in the product documentation would be */ +/* appreciated but is not required. */ +/* 2. Altered source versions must be plainly marked as such, and must not */ +/* be misrepresented as being the original software. */ +/* 3. This notice may not be removed or altered from any source */ +/* distribution. */ +/* */ +/*****************************************************************************/ @@ -12,6 +37,7 @@ #include /* common */ +#include "coll.h" #include "xmalloc.h" /* cc65 */ @@ -29,19 +55,10 @@ #include "loop.h" #include "pragma.h" #include "scanner.h" +#include "swstmt.h" #include "symtab.h" #include "stmt.h" - - - -/*****************************************************************************/ -/* Data */ -/*****************************************************************************/ - - - -/* Maximum count of cases */ -#define CASE_MAX 257 +#include "typeconv.h" @@ -58,22 +75,40 @@ static void CheckTok (token_t Tok, const char* Msg, int* PendingToken) */ { if (CurTok.Tok != Tok) { - Error (Msg); + Error (Msg); } else if (PendingToken) { - *PendingToken = 1; + *PendingToken = 1; } else { - NextToken (); + NextToken (); } } static void CheckSemi (int* PendingToken) -/* Helper function for Statement. Will call CheckTok with the parameters - * for a semicolon. +/* Helper function for Statement. Will check for a semicolon and print an + * error message if not found (plus some error recovery). If PendingToken is + * NULL, it will the skip the token, otherwise it will store one to + * PendingToken. + * This function is a special version of CheckTok with the addition of the + * error recovery. */ { - CheckTok (TOK_SEMI, "`;' expected", PendingToken); + int HaveToken = (CurTok.Tok == TOK_SEMI); + if (!HaveToken) { + Error ("`;' expected"); + /* Try to be smart about errors */ + if (CurTok.Tok == TOK_COLON || CurTok.Tok == TOK_COMMA) { + HaveToken = 1; + } + } + if (HaveToken) { + if (PendingToken) { + *PendingToken = 1; + } else { + NextToken (); + } + } } @@ -105,7 +140,7 @@ static int IfStatement (void) /* Generate a jump label and parse the condition */ Label1 = GetLocalLabel (); - test (Label1, 0); + TestInParens (Label1, 0); /* Parse the if body */ GotBreak = Statement (0); @@ -166,7 +201,7 @@ static void DoStatement (void) /* Parse the end condition */ Consume (TOK_WHILE, "`while' expected"); - test (loop, 1); + TestInParens (loop, 1); ConsumeSemi (); /* Define the break label */ @@ -197,7 +232,7 @@ static void WhileStatement (void) g_defcodelabel (loop); /* Test the loop condition */ - test (lab, 0); + TestInParens (lab, 0); /* Loop body */ Statement (&PendingToken); @@ -208,7 +243,9 @@ static void WhileStatement (void) /* Exit label */ g_defcodelabel (lab); - /* Eat remaining tokens that were delay because of line info correctness */ + /* Eat remaining tokens that were delayed because of line info + * correctness + */ SkipPending (PendingToken); /* Remove the loop from the loop stack */ @@ -220,30 +257,39 @@ static void WhileStatement (void) static void ReturnStatement (void) /* Handle the 'return' statement */ { - ExprDesc lval; + ExprDesc Expr; + int k; NextToken (); if (CurTok.Tok != TOK_SEMI) { - if (HasVoidReturn (CurrentFunc)) { + + /* Check if the function has a return value declared */ + if (F_HasVoidReturn (CurrentFunc)) { Error ("Returning a value in function with return type void"); } - /* Evaluate the return expression. Result will be in primary */ - expression (&lval); + /* Evaluate the return expression */ + k = hie0 (InitExprDesc (&Expr)); + + /* Ignore the return expression if the function returns void */ + if (!F_HasVoidReturn (CurrentFunc)) { + + /* Convert the return value to the type of the function result */ + k = TypeConversion (&Expr, k, F_GetReturnType (CurrentFunc)); - /* Convert the return value to the type of the function result */ - if (!HasVoidReturn (CurrentFunc)) { - assignadjust (GetReturnType (CurrentFunc), &lval); + /* Load the value into the primary */ + ExprLoad (CF_NONE, k, &Expr); } - } else if (!HasVoidReturn (CurrentFunc)) { - Error ("Function `%s' must return a value", GetFuncName (CurrentFunc)); + + } else if (!F_HasVoidReturn (CurrentFunc) && !F_HasOldStyleIntRet (CurrentFunc)) { + Error ("Function `%s' must return a value", F_GetFuncName (CurrentFunc)); } /* Cleanup the stack in case we're inside a block with locals */ - g_space (oursp - GetTopLevelSP (CurrentFunc)); + g_space (oursp - F_GetTopLevelSP (CurrentFunc)); /* Output a jump to the function exit code */ - g_jump (GetRetLab (CurrentFunc)); + g_jump (F_GetRetLab (CurrentFunc)); } @@ -261,9 +307,9 @@ static void BreakStatement (void) /* Check if we are inside a loop */ if (L == 0) { - /* Error: No current loop */ - Error ("`break' statement not within loop or switch"); - return; + /* Error: No current loop */ + Error ("`break' statement not within loop or switch"); + return; } /* Correct the stack pointer if needed */ @@ -286,19 +332,19 @@ static void ContinueStatement (void) /* Get the current loop descriptor */ L = CurrentLoop (); if (L) { - /* Search for the correct loop */ - do { - if (L->Loop) { - break; - } - L = L->Next; - } while (L); + /* Search for the correct loop */ + do { + if (L->Loop) { + break; + } + L = L->Next; + } while (L); } /* Did we find it? */ if (L == 0) { - Error ("`continue' statement not within a loop"); - return; + Error ("`continue' statement not within a loop"); + return; } /* Correct the stackpointer if needed */ @@ -314,325 +360,10 @@ static void ContinueStatement (void) -static void CascadeSwitch (ExprDesc* eval) -/* Handle a switch statement for chars with a cmp cascade for the selector */ -{ - unsigned ExitLab; /* Exit label */ - unsigned NextLab; /* Next case label */ - unsigned CodeLab; /* Label that starts the actual selector code */ - int HaveBreak; /* Remember if we exited with break */ - int HaveDefault; /* Remember if we had a default label */ - int lcount; /* Label count */ - unsigned Flags; /* Code generator flags */ - ExprDesc lval; /* Case label expression */ - long Val; /* Case label value */ - - - /* Create a loop so we may break out, init labels */ - ExitLab = GetLocalLabel (); - AddLoop (oursp, 0, ExitLab, 0, 0); - - /* Setup some variables needed in the loop below */ - Flags = TypeOf (eval->e_tptr) | CF_CONST | CF_FORCECHAR; - CodeLab = NextLab = 0; - HaveBreak = 1; - HaveDefault = 0; - - /* Parse the labels */ - lcount = 0; - while (CurTok.Tok != TOK_RCURLY) { - - if (CurTok.Tok == TOK_CASE || CurTok.Tok == TOK_DEFAULT) { - - /* If the code for the previous selector did not end with a - * break statement, we must jump over the next selector test. - */ - if (!HaveBreak) { - /* Define a label for the code */ - if (CodeLab == 0) { - CodeLab = GetLocalLabel (); - } - g_jump (CodeLab); - } - - /* If we have a cascade label, emit it */ - if (NextLab) { - g_defcodelabel (NextLab); - NextLab = 0; - } - - while (CurTok.Tok == TOK_CASE || CurTok.Tok == TOK_DEFAULT) { - - /* Parse the selector */ - if (CurTok.Tok == TOK_CASE) { - - /* Count labels */ - ++lcount; - - /* Skip the "case" token */ - NextToken (); - - /* Read the selector expression */ - constexpr (&lval); - if (!IsClassInt (lval.e_tptr)) { - Error ("Switch quantity not an integer"); - } - - /* Check the range of the expression */ - Val = lval.e_const; - switch (*eval->e_tptr) { - - case T_SCHAR: - /* Signed char */ - if (Val < -128 || Val > 127) { - Error ("Range error"); - } - break; - - case T_UCHAR: - if (Val < 0 || Val > 255) { - Error ("Range error"); - } - break; - - case T_INT: - if (Val < -32768 || Val > 32767) { - Error ("Range error"); - } - break; - - case T_UINT: - if (Val < 0 || Val > 65535) { - Error ("Range error"); - } - break; - - default: - Internal ("Invalid type: %02X", *eval->e_tptr & 0xFF); - } - - /* Emit a compare */ - g_cmp (Flags, Val); - - /* If another case follows, we will jump to the code if - * the condition is true. - */ - if (CurTok.Tok == TOK_CASE) { - /* Create a code label if needed */ - if (CodeLab == 0) { - CodeLab = GetLocalLabel (); - } - g_falsejump (CF_NONE, CodeLab); - } else if (CurTok.Tok != TOK_DEFAULT) { - /* No case follows, jump to next selector */ - if (NextLab == 0) { - NextLab = GetLocalLabel (); - } - g_truejump (CF_NONE, NextLab); - } - - /* Skip the colon */ - ConsumeColon (); - - } else { - - /* Default case */ - NextToken (); - - /* Handle the pathologic case: DEFAULT followed by CASE */ - if (CurTok.Tok == TOK_CASE) { - if (CodeLab == 0) { - CodeLab = GetLocalLabel (); - } - g_jump (CodeLab); - } - - /* Skip the colon */ - ConsumeColon (); - - /* Remember that we had a default label */ - HaveDefault = 1; - } - - } - - } - - /* Emit a code label if we have one */ - if (CodeLab) { - g_defcodelabel (CodeLab); - CodeLab = 0; - } - - /* Parse statements */ - if (CurTok.Tok != TOK_RCURLY) { - HaveBreak = Statement (0); - } - } - - /* Check if we have any labels */ - if (lcount == 0 && !HaveDefault) { - Warning ("No case labels"); - } - - /* Define the exit label and, if there's a next label left, create this - * one, too. - */ - if (NextLab) { - g_defcodelabel (NextLab); - } - g_defcodelabel (ExitLab); - - /* Eat the closing curly brace */ - NextToken (); - - /* End the loop */ - DelLoop (); -} - - - -static void TableSwitch (ExprDesc* eval) -/* Handle a switch statement via table based selector */ -{ - /* Entry for one case in a switch statement */ - struct swent { - long sw_const; /* selector value */ - unsigned sw_lab; /* label for this selector */ - }; - - int dlabel; /* for default */ - int lab; /* exit label */ - int label; /* label for case */ - int lcase; /* label for compares */ - int lcount; /* Label count */ - int HaveBreak; /* Last statement has a break */ - int HaveDefault; /* Remember if we had a default label */ - unsigned Flags; /* Code generator flags */ - ExprDesc lval; /* Case label expression */ - struct swent *p; - struct swent *swtab; - - /* Allocate memory for the switch table */ - swtab = xmalloc (CASE_MAX * sizeof (struct swent)); - - /* Create a look so we may break out, init labels */ - HaveBreak = 0; /* Keep gcc silent */ - HaveDefault = 0; /* No default case until now */ - dlabel = 0; /* init */ - lab = GetLocalLabel (); /* get exit */ - p = swtab; - AddLoop (oursp, 0, lab, 0, 0); - - /* Jump behind the code for the CASE labels */ - g_jump (lcase = GetLocalLabel ()); - lcount = 0; - while (CurTok.Tok != TOK_RCURLY) { - if (CurTok.Tok == TOK_CASE || CurTok.Tok == TOK_DEFAULT) { - if (lcount >= CASE_MAX) { - Fatal ("Too many case labels"); - } - label = GetLocalLabel (); - do { - if (CurTok.Tok == TOK_CASE) { - NextToken (); - constexpr (&lval); - if (!IsClassInt (lval.e_tptr)) { - Error ("Switch quantity not an integer"); - } - p->sw_const = lval.e_const; - p->sw_lab = label; - ++p; - ++lcount; - } else { - NextToken (); - dlabel = label; - HaveDefault = 1; - } - ConsumeColon (); - } while (CurTok.Tok == TOK_CASE || CurTok.Tok == TOK_DEFAULT); - g_defcodelabel (label); - HaveBreak = 0; - } - if (CurTok.Tok != TOK_RCURLY) { - HaveBreak = Statement (0); - } - } - - /* Check if we have any labels */ - if (lcount == 0 && !HaveDefault) { - Warning ("No case labels"); - } - - /* Eat the closing curly brace */ - NextToken (); - - /* If the last statement doesn't have a break or return, add one */ - if (!HaveBreak) { - g_jump (lab); - } - - /* Actual selector code goes here */ - g_defcodelabel (lcase); - - /* Create the call to the switch subroutine */ - Flags = TypeOf (eval->e_tptr); - g_switch (Flags); - - /* First entry is negative of label count */ - g_defdata (CF_INT | CF_CONST, -((int)lcount)-1, 0); - - /* Create the case selector table */ - p = swtab; - while (lcount) { - g_case (Flags, p->sw_lab, p->sw_const); /* Create one label */ - --lcount; - ++p; - } - - if (dlabel) { - g_jump (dlabel); - } - g_defcodelabel (lab); - DelLoop (); - - /* Free the allocated space for the labels */ - xfree (swtab); -} - - - -static void SwitchStatement (void) -/* Handle a 'switch' statement */ -{ - ExprDesc eval; /* Switch statement expression */ - - /* Eat the "switch" */ - NextToken (); - - /* Read the switch expression */ - ConsumeLParen (); - intexpr (&eval); - ConsumeRParen (); - - /* result of expr is in P */ - ConsumeLCurly (); - - /* Now decide which sort of switch we will create: */ - if (IsTypeChar (eval.e_tptr) || (CodeSizeFactor >= 200 && IsClassInt (eval.e_tptr))) { - CascadeSwitch (&eval); - } else { - TableSwitch (&eval); - } -} - - - static void ForStatement (void) /* Handle a 'for' statement */ { ExprDesc lval1; - ExprDesc lval2; ExprDesc lval3; int HaveIncExpr; CodeMark IncExprStart; @@ -665,8 +396,7 @@ static void ForStatement (void) /* Parse the test expression */ if (CurTok.Tok != TOK_SEMI) { - boolexpr (&lval2); - g_truejump (CF_NONE, lstat); + Test (lstat, 1); g_jump (lab); } else { g_jump (lstat); @@ -839,12 +569,12 @@ int Statement (int* PendingToken) case TOK_SEMI: /* Ignore it */ - NextToken (); + CheckSemi (PendingToken); break; case TOK_PRAGMA: DoPragma (); - break; + break; default: /* Actual statement */ @@ -857,3 +587,4 @@ int Statement (int* PendingToken) +