cleanup; moved extern's from .c to .h files for double check

[fw/sdcc] / src / SDCCicode.c

diff --git a/src/SDCCicode.c b/src/SDCCicode.c
index 287379af13c31ca8229cfcd88c749fabd4bf61ab..802abd7b4ee07e56c9fac0e5ce8ecb71f544d1cf 100644 (file)
--- a/src/SDCCicode.c
+++ b/src/SDCCicode.c
@@ -38,8 +38,6 @@ int block;
 int scopeLevel;
 int lvaluereq;
 
-extern int labelKey ;
-
 symbol *returnLabel ; /* function return label */
 symbol *entryLabel  ; /* function entry  label */
 /*-----------------------------------------------------------------*/
@@ -751,8 +749,10 @@ bool isOperandInFarSpace (operand *op)
        else            
            return FALSE;
     }
-
-    etype = getSpec(operandType(op));
+    else
+    {
+       etype = getSpec(operandType(op));
+    }
     return (IN_FARSPACE(SPEC_OCLS(etype)) ? TRUE : FALSE);
 }
 
@@ -1085,7 +1085,7 @@ operand *operandFromSymbol (symbol *sym)
     /* under the following conditions create a
        register equivalent for a local symbol */
     if (sym->level && sym->etype && SPEC_OCLS(sym->etype) &&
-       IN_FARSPACE(SPEC_OCLS(sym->etype))  &&
+       (IN_FARSPACE(SPEC_OCLS(sym->etype)) && (!IS_DS390_PORT)) &&
        options.stackAuto == 0)
        ok =0;
 
@@ -2339,8 +2339,9 @@ static void geniCodeParms ( ast *parms , int *stack, link *fetype)
     }
 
     /* if register parm then make it a send */
-    if ((parms->argSym && IS_REGPARM(parms->argSym->etype)) ||
-       IS_REGPARM(parms->etype)) {
+    if (((parms->argSym && IS_REGPARM(parms->argSym->etype)) ||
+       IS_REGPARM(parms->etype)) && 
+       !IS_RENT(fetype)) {
        ic = newiCode(SEND,pval,NULL);
        ADDTOCHAIN(ic);
     } else {
@@ -2420,8 +2421,9 @@ static void geniCodeReceive (value *args)
               and before liveRange calculation */          
            if (!sym->addrtaken && !IS_VOLATILE(sym->etype)) {
 
-               if(IN_FARSPACE(SPEC_OCLS(sym->etype)) &&
-                  options.stackAuto == 0) {
+               if (IN_FARSPACE(SPEC_OCLS(sym->etype)) &&
+                  options.stackAuto == 0 &&
+                  !IS_DS390_PORT) {
                } else {
                    opl = newiTempOperand(args->type,0);
                    sym->reqv = opl ;       
@@ -2751,15 +2753,19 @@ operand *ast2iCode (ast *tree)
         tree->opval.op != SWITCH &&
         tree->opval.op != FUNCTION &&
         tree->opval.op != INLINEASM ) {
+
        if (IS_ASSIGN_OP(tree->opval.op) || 
            IS_DEREF_OP(tree)            || 
            (tree->opval.op == '&' && !tree->right) ||
            tree->opval.op == PTR_OP) {
-           lvaluereq++;
-           if (IS_ARRAY_OP(tree->left) && IS_ARRAY_OP(tree->left->left))
+           lvaluereq++;
+           if ((IS_ARRAY_OP(tree->left) && IS_ARRAY_OP(tree->left->left)) ||
+               (IS_DEREF_OP(tree) && IS_ARRAY_OP(tree->left)))
            {
-               lvaluereq--;
+               int olvr = lvaluereq ;
+               lvaluereq = 0;
                left = operandFromAst(tree->left);
+               lvaluereq = olvr - 1;
            } else {
                left = operandFromAst(tree->left);
                lvaluereq--;