From b14b9fa849248172be1b50cfefe49e1445867d9c Mon Sep 17 00:00:00 2001
From: borutr <borutr@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 26 Dec 2004 08:42:47 +0000
Subject: [PATCH] * sim/ucsim/avr.src/arith_inst.cc: fixed bug #1088372- savr
 is not   built by gcc 3.4.2

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3613 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                       |  5 +++++
 sim/ucsim/avr.src/arith_inst.cc | 16 ++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 22bf509a..534b5110 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-26 Borut Razem <borut.razem AT siol.net>
+
+	* sim/ucsim/avr.src/arith_inst.cc: fixed bug #1088372- savr is not
+	  built by gcc 3.4.2
+
 2004-12-25 Paul Stoffregen <paul AT pjrc.com>
 
 	* device/lib/printf_tiny.c: printf for mcs51 in only 267 bytes,
diff --git a/sim/ucsim/avr.src/arith_inst.cc b/sim/ucsim/avr.src/arith_inst.cc
index 86cc5b99..06d0db9f 100644
--- a/sim/ucsim/avr.src/arith_inst.cc
+++ b/sim/ucsim/avr.src/arith_inst.cc
@@ -51,7 +51,7 @@ cl_avr::cpi_Rd_K(t_mem code)
   if (D & 0x80)
     D|= ~0xff;
   t_mem sreg= ram->get(SREG);
-  (signed)result= (signed)D-(signed)K;
+  result= (signed)D-(signed)K;
   res= result & 0xff;
   
   sreg= sreg & ~(BIT_H|BIT_S|BIT_V|BIT_N|BIT_C|BIT_Z);
@@ -101,7 +101,7 @@ cl_avr::sbci_Rd_K(t_mem code)
   if (D & 0x80)
     D|= ~0xff;
   t_mem sreg= ram->get(SREG);
-  (signed)result= (signed)D-(signed)K-(sreg&BIT_C)?1:0;
+  result= (signed)D-(signed)K-(sreg&BIT_C)?1:0;
   res= result & 0xff;
   ram->write(d, res);
   
@@ -151,7 +151,7 @@ cl_avr::subi_Rd_K(t_mem code)
     K|= ~0xff;
   if (D & 0x80)
     D|= ~0xff;
-  (signed)result= (signed)D-(signed)K;
+  result= (signed)D-(signed)K;
   res= result & 0xff;
   ram->write(d, res);
   
@@ -237,7 +237,7 @@ cl_avr::cpc_Rd_Rr(t_mem code)
   if (D & 0x80)
     D|= ~0xff;
   t_mem sreg= ram->get(SREG);
-  (signed)result= (signed)D-(signed)R-(sreg&BIT_C)?1:0;
+  result= (signed)D-(signed)R-(sreg&BIT_C)?1:0;
   res= result & 0xff;
   
   sreg= sreg & ~(BIT_H|BIT_S|BIT_V|BIT_N|BIT_C);
@@ -287,7 +287,7 @@ cl_avr::sbc_Rd_Rr(t_mem code)
   if (D & 0x80)
     D|= ~0xff;
   t_mem sreg= ram->get(SREG);
-  (signed)result= (signed)D-(signed)R-(sreg&BIT_C)?1:0;
+  result= (signed)D-(signed)R-(sreg&BIT_C)?1:0;
   res= result & 0xff;
   ram->write(d, res);
   
@@ -389,7 +389,7 @@ cl_avr::cp_Rd_Rr(t_mem code)
     R|= ~0xff;
   if (D & 0x80)
     D|= ~0xff;
-  (signed)result= (signed)D-(signed)R;
+  result= (signed)D-(signed)R;
   res= result & 0xff;
   
   t_mem sreg= ram->get(SREG) & ~(BIT_H|BIT_S|BIT_V|BIT_N|BIT_Z|BIT_C);
@@ -438,7 +438,7 @@ cl_avr::sub_Rd_Rr(t_mem code)
     R|= ~0xff;
   if (D & 0x80)
     D|= ~0xff;
-  (signed)result= (signed)D-(signed)R;
+  result= (signed)D-(signed)R;
   res= result & 0xff;
   ram->write(d, res);
   
@@ -922,7 +922,7 @@ cl_avr::sbiw_Rdl_K(t_mem code)
     K|= ~0x3f;
   if (D & 0x8000)
     D|= ~0xffff;
-  (signed)result= (signed)D-(signed)K;
+  result= (signed)D-(signed)K;
   res= result & 0xffff;
   t_mem resl= res&0xff, resh= (res>>8)&0xff;
   ram->write(dl+1, resh);
-- 
2.30.2