Function inlining works well now. Added more flow analysis.

[fw/sdcc] / src / pic / genarith.c

diff --git a/src/pic/genarith.c b/src/pic/genarith.c
index de312a503aafa1efc7831f4a270325dbbf94bc24..2e701a04254b396bf9930c553fc06c952df182bc 100644 (file)
--- a/src/pic/genarith.c
+++ b/src/pic/genarith.c
@@ -905,13 +905,11 @@ void genPlus (iCode *ic)
        if (pic14_sameRegs(AOP(IC_LEFT(ic)), AOP(IC_RESULT(ic))) )
          emitpcode(POC_ADDWF, popGet(AOP(IC_LEFT(ic)),0));
        else {
-         if( (AOP_TYPE(IC_LEFT(ic)) == AOP_IMMD) ||
-             (AOP_TYPE(IC_LEFT(ic)) == AOP_PCODE) ||
-             (AOP_TYPE(IC_LEFT(ic)) == AOP_LIT) ) {
-           emitpcode(POC_ADDLW, popGet(AOP(IC_LEFT(ic)),0));
-         } else {
-           emitpcode(POC_ADDFW, popGet(AOP(IC_LEFT(ic)),0));
-         }
+         PIC_OPCODE poc = POC_ADDFW;
+
+         if ((AOP_TYPE(IC_LEFT(ic)) == AOP_PCODE) && AOP(IC_LEFT(ic))->aopu.pcop->type == PO_LITERAL)
+           poc = POC_ADDLW;
+         emitpcode(poc, popGet(AOP(IC_LEFT(ic)),0));
          if ( AOP_TYPE(IC_RESULT(ic)) != AOP_ACC)
            emitpcode(POC_MOVWF,popGet(AOP(IC_RESULT(ic)),0));
        }