From 60616228307b15c90848e59ba1975ded948906b0 Mon Sep 17 00:00:00 2001 From: Nick Clifton Date: Fri, 22 Aug 1997 17:41:20 +0000 Subject: Updated with respect to the HDD-tool-0611 document. --- sim/v850/ChangeLog | 18 ++++++++ sim/v850/simops.c | 122 ++++++++++++++++++++++++++++------------------------- 2 files changed, 82 insertions(+), 58 deletions(-) (limited to 'sim/v850') diff --git a/sim/v850/ChangeLog b/sim/v850/ChangeLog index cf73492..56a69a5 100644 --- a/sim/v850/ChangeLog +++ b/sim/v850/ChangeLog @@ -1,3 +1,21 @@ +start-sanitize-v850e +Fri Aug 22 10:39:28 1997 Nick Clifton + + * simops.c (bsh): Only set CY flag if either of the bottom + bytes is zero. + + * simops.c (prepare, dispose): Lower numbered + registers go to higher numbered address. + + * simops.c (unsigned divide instructions): S bit set if result has + top bit set. + +start-sanitize-v850eq + * simops.c (pushml, pushmh, popml, popmh): Lower numbered + registers go to higher numbered address. +end-sanitize-v850eq +end-sanitize-v850e + Wed Aug 20 13:56:35 1997 Nick Clifton * simops.c (OP_107E0, OP_107F0, OP_307E0, OP_307F0): Use correct diff --git a/sim/v850/simops.c b/sim/v850/simops.c index fa0ea08..70df0ce 100644 --- a/sim/v850/simops.c +++ b/sim/v850/simops.c @@ -1669,8 +1669,8 @@ OP_640 () SP += (OP[3] & 0x3e) << 1; - /* Load the registers with lower number registers being retrieved from lower addresses. */ - for (i = 0; i < 12; i++) + /* Load the registers with lower number registers being retrieved from higher addresses. */ + for (i = 12; i--;) if ((OP[3] & (1 << type1_regs[ i ]))) { State.regs[ 20 + i ] = load_mem (SP, 4); @@ -2692,6 +2692,7 @@ OP_1C207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_IMM_REG_REG_REG); @@ -2761,6 +2762,7 @@ OP_18207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_IMM_REG_REG_REG); @@ -2837,6 +2839,7 @@ OP_2C207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_REG_REG_REG); } @@ -2863,6 +2866,7 @@ OP_2C207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_IMM_REG_REG_REG); } @@ -2973,6 +2977,7 @@ OP_28207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_REG_REG_REG); } @@ -2999,6 +3004,7 @@ OP_28207E0 (void) if (overflow) PSW |= PSW_OV; if (quotient == 0) PSW |= PSW_Z; + if (quotient & 0x80000000) PSW |= PSW_S; trace_output (OP_IMM_REG_REG_REG); } @@ -3203,7 +3209,7 @@ OP_34207E0 (void) if (value == 0) PSW |= PSW_Z; if (value & 0x80000000) PSW |= PSW_S; - if (((value & 0xffff) == 0) || (value & 0xffff0000) == 0) PSW |= PSW_CY; + if (((value & 0xff) == 0) || (value & 0x00ff) == 0) PSW |= PSW_CY; trace_output (OP_REG_REG3); @@ -3221,6 +3227,21 @@ OP_107E0 (void) trace_input ("pushml", OP_PUSHPOP3, 0); + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 15; i++) + if ((OP[3] & (1 << type3_regs[ i ]))) + { + SP -= 4; + store_mem (SP & ~ 3, 4, State.regs[ i + 1 ]); + } + + if (OP[3] & (1 << 3)) + { + SP -= 4; + + store_mem (SP & ~ 3, 4, PSW); + } + if (OP[3] & (1 << 19)) { SP -= 8; @@ -3237,21 +3258,6 @@ OP_107E0 (void) } } - if (OP[3] & (1 << 3)) - { - SP -= 4; - - store_mem (SP & ~ 3, 4, PSW); - } - - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 15; i--;) - if ((OP[3] & (1 << type3_regs[ i ]))) - { - SP -= 4; - store_mem (SP & ~ 3, 4, State.regs[ i + 1 ]); - } - trace_output (OP_PUSHPOP2); } else @@ -3282,8 +3288,8 @@ OP_10780 (void) trace_input ("prepare", OP_PUSHPOP1, 0); - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 12; i--;) + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 12; i++) if ((OP[3] & (1 << type1_regs[ i ]))) { SP -= 4; @@ -3318,8 +3324,8 @@ OP_1B0780 (void) trace_input ("prepare", OP_PUSHPOP1, 0); - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 12; i--;) + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 12; i++) if ((OP[3] & (1 << type1_regs[ i ]))) { SP -= 4; @@ -3343,8 +3349,8 @@ OP_130780 (void) trace_input ("prepare", OP_PUSHPOP1, 0); - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 12; i--;) + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 12; i++) if ((OP[3] & (1 << type1_regs[ i ]))) { SP -= 4; @@ -3368,8 +3374,8 @@ OP_B0780 (void) trace_input ("prepare", OP_PUSHPOP1, 0); - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 12; i--;) + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 12; i++) if ((OP[3] & (1 << type1_regs[ i ]))) { SP -= 4; @@ -3393,8 +3399,8 @@ OP_30780 (void) trace_input ("prepare", OP_PUSHPOP1, 0); - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 12; i--;) + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 12; i++) if ((OP[3] & (1 << type1_regs[ i ]))) { SP -= 4; @@ -3474,14 +3480,6 @@ OP_307F0 (void) trace_input ("popmh", OP_PUSHPOP2, 0); - /* Load the registers with lower number registers being retrieved from lower addresses. */ - for (i = 0; i++; i < 16) - if ((OP[3] & (1 << type2_regs[ i ]))) - { - State.regs[ i + 16 ] = load_mem (SP & ~ 3, 4); - SP += 4; - } - if (OP[3] & (1 << 19)) { if ((PSW & PSW_NP) && ((PSW & PSW_EP) == 0)) @@ -3498,6 +3496,14 @@ OP_307F0 (void) SP += 8; } + /* Load the registers with lower number registers being retrieved from higher addresses. */ + for (i = 16; i--;) + if ((OP[3] & (1 << type2_regs[ i ]))) + { + State.regs[ i + 16 ] = load_mem (SP & ~ 3, 4); + SP += 4; + } + trace_output (OP_PUSHPOP2); return 4; @@ -3511,20 +3517,6 @@ OP_107F0 (void) trace_input ("popml", OP_PUSHPOP3, 0); - /* Load the registers with lower number registers being retrieved from lower addresses. */ - for (i = 0; i++; i < 15) - if ((OP[3] & (1 << type3_regs[ i ]))) - { - State.regs[ i + 1 ] = load_mem (SP & ~ 3, 4); - SP += 4; - } - - if (OP[3] & (1 << 3)) - { - PSW = load_mem (SP & ~ 3, 4); - SP += 4; - } - if (OP[3] & (1 << 19)) { if ((PSW & PSW_NP) && ((PSW & PSW_EP) == 0)) @@ -3541,6 +3533,20 @@ OP_107F0 (void) SP += 8; } + if (OP[3] & (1 << 3)) + { + PSW = load_mem (SP & ~ 3, 4); + SP += 4; + } + + /* Load the registers with lower number registers being retrieved from higher addresses. */ + for (i = 15; i--;) + if ((OP[3] & (1 << type3_regs[ i ]))) + { + State.regs[ i + 1 ] = load_mem (SP & ~ 3, 4); + SP += 4; + } + trace_output (OP_PUSHPOP2); } @@ -3552,6 +3558,14 @@ OP_307E0 (void) trace_input ("pushmh", OP_PUSHPOP2, 0); + /* Store the registers with lower number registers being placed at higher addresses. */ + for (i = 0; i < 16; i++) + if ((OP[3] & (1 << type2_regs[ i ]))) + { + SP -= 4; + store_mem (SP & ~ 3, 4, State.regs[ i + 16 ]); + } + if (OP[3] & (1 << 19)) { SP -= 8; @@ -3568,14 +3582,6 @@ OP_307E0 (void) } } - /* Store the registers with lower number registers being placed at lower addresses. */ - for (i = 16; i--;) - if ((OP[3] & (1 << type2_regs[ i ]))) - { - SP -= 4; - store_mem (SP & ~ 3, 4, State.regs[ i + 16 ]); - } - trace_output (OP_PUSHPOP2); return 4; -- cgit v1.1