From d7c3e75f98bbabd240d8a0b808b2efbd8144a495 Mon Sep 17 00:00:00 2001
From: tecodev <tecodev@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Mon, 22 Aug 2005 08:58:30 +0000
Subject: [PATCH] * src/pic16/gen.c (pic16_loadFromReturn): added check for
 AOP_PCODE,   fixes #1265442 (crash on Solaris)

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3868 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog       | 5 +++++
 src/pic16/gen.c | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 1700b385..74051b5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-22 Raphael Neider <rneider AT web.de>
+
+	* src/pic16/gen.c (pic16_loadFromReturn): added check for AOP_PCODE,
+	  fixes #1265442 (crash on Solaris)
+
 2005-08-20 Borut Razem <borut.razem AT siol.net>
 
 	* configure, configure.in: added tests for libsocket and libnsl libraries,
diff --git a/src/pic16/gen.c b/src/pic16/gen.c
index d1097d20..2139f358 100644
--- a/src/pic16/gen.c
+++ b/src/pic16/gen.c
@@ -3003,7 +3003,7 @@ static void pushSide(operand * oper, int size)
 
 void pic16_loadFromReturn(operand *op, int offset, pCodeOp *src)
 {
-  if(AOP(op)->aopu.pcop->type == PO_IMMEDIATE) {
+  if((AOP(op)->type == AOP_PCODE) && (AOP(op)->aopu.pcop->type == PO_IMMEDIATE)) {
     pic16_emitpcode(POC_MOVFW, src);
     pic16_emitpcode(POC_MOVWF, pic16_popGet(AOP(op), offset));
   } else {
-- 
2.30.2