+2007-05-07 Maarten Brock <sourceforge.brock AT dse.nl>
+
+ * device/lib/_gptrput.c,
+ * device/lib/_gptrget.c: removed old code,
+ (_gptrgetWord),
+ * src/ds390/gen.c (genGenPointerGet): fixed bug 1714204
+ * support/regression/tests/bug1714204.c: new, added
+
2007-05-06 Frieder Ferlemann <Frieder.Ferlemann AT web.de>
* support/regression/tests/regtrack.c: test was never executed
__endasm;
}
-#elif 1
+#else
void
_gptrget (char *gptr) __naked
__endasm;
}
-#else
-
-void
-_gptrget (char *gptr) __naked
-{
-/* This is the old version with pointers up to 16 bits. */
-
- gptr; /* hush the compiler */
-
- __asm
- ;
- ; depending on the pointer type acc. to SDCCsymt.h
- ;
- mov a,b ; 2
- jz 00001$ ; 0 near ; 2
- dec a ; 1
- jz 00002$ ; 1 far ; 2
- dec a ; 1
- jz 00003$ ; 2 code ; 2
- dec a ; 1
- jz 00004$ ; 3 pdata ; 2
- dec a ; 4 skip generic pointer ; 1
- dec a ; 1
- jz 00001$ ; 5 idata ; 2
- ;
- ; any other value for type
- ; return xFF
- mov a,#0xff ; 2
- ret ; 1
- ;
- ; Pointer to data space
- ;
- 00001$:
- push ar0 ; 2
- ;
- mov r0,dpl ; use only low order address ; 2
- mov a,@r0 ; 1
- ;
- pop ar0 ; 2
- ;
- ret ; 1
- ;
- ; pointer to xternal data
- ;
- 00002$:
- movx a,@dptr ; 1
- ret ; 1
-;
-; pointer to code area
-;
- 00003$:
- ; clr a is already 0
- movc a,@a+dptr ; 1
- ret ; 1
-;
-; pointer to xternal stack or pdata
-;
- 00004$:
-#if USE_PDATA_PAGING_REGISTER
- mov dph,__XPAGE ; __XPAGE (usually p2) holds high byte for pdata access
- movx a,@dptr
-#else
- push ar0 ; 2
- mov r0,dpl ; 2
- movx a,@r0 ; 1
- pop ar0 ; 2
-#endif
- ret ; 1
- ;===
- ;40 bytes
- __endasm;
-}
#endif
#ifdef SDCC_ds390
/* the return value is expected to be in acc/_ap, and not in the standard
* location dpl/dph. Therefore we choose return type void here: */
-#if 1
-
void
_gptrgetWord (unsigned *gptr)
{
-/* This is the new version */
gptr; /* hush the compiler */
__asm
mov r0,dph ; restore r0
mov dph,#0 ; restore dph
00006$:
+ xch a,_ap
__endasm;
}
-#else
-
-void
-_gptrgetWord (unsigned *gptr)
-{
- gptr; /* hush the compiler */
-
- __asm
- ;
- ; depending on the pointer type acc. to SDCCsymt.h
- ;
- mov a,b
- jz 00001$ ; 0 near
- dec a
- jz 00002$ ; 1 far
- dec a
- jz 00003$ ; 2 code
- dec a
- jz 00004$ ; 3 pdata
- dec a ; 4 skip generic pointer
- dec a
- jz 00001$ ; 5 idata
- ;
- ; any other value for type
- ; return xFF
- mov a,#0xff
- sjmp 00006$
- ;
- ; Pointer to data space
- ;
- 00001$:
- push ar0
- mov r0,dpl ; use only low order address
- mov _ap,@r0
- inc r0
- mov a,@r0
- inc dpl
- sjmp 00005$
- ;
- ; pointer to xternal data
- ;
- 00002$:
- movx a,@dptr
- mov _ap,a
- inc dptr
- movx a,@dptr
- sjmp 00006$
-;
-; pointer to code area
-;
- 00003$:
- ; clr a is already 0
- movc a,@a+dptr
- mov _ap,a
- clr a
- inc dptr
- movc a,@a+dptr
- sjmp 00006$
-;
-; pointer to xternal stack
-;
- 00004$:
- push ar0
- mov r0,dpl
- movx a,@r0
- mov _ap,a
- inc r0
- movx a,@r0
- inc dpl
-;
-; restore and return
-;
-00005$:
- pop ar0
-00006$:
- __endasm;
-
-}
-#endif
-
#endif
__endasm;
}
-#elif 1
+#else
void
_gptrput (char *gptr, char c) __naked
__endasm;
}
-#else
-
-void
-_gptrput (char *gptr, char c) __naked
-{
-/* This is the old version with pointers up to 16 bits. */
-
- gptr; c; /* hush the compiler */
-
- __asm
- ar0 = 0x00
- push acc ; 2
- ;
- ; depending on the pointer type acc. to SDCCsymt.h
- ;
- mov a,b ; 2
- jz 00001$ ; 0 near ; 2
- dec a ; 1
- jz 00002$ ; 1 far ; 2
- dec a ; 1
- jz 00003$ ; 2 code ; 2
- dec a ; 1
- jz 00004$ ; 3 pdata ; 2
- dec a ; 4 skip generic pointer ; 1
- dec a ; 1
- jz 00001$ ; 5 idata ; 2
-
- 00003$:
- pop acc ; do nothing ; 2
- ret ; 1
-;
-; store into near space
-;
- 00001$:
- pop acc ; 2
- push ar0 ; 2
- mov r0,dpl ; 2
- mov @r0,a ; 1
- pop ar0 ; 2
- ret ; 1
-
- 00002$:
- pop acc ; 2
- movx @dptr,a ; 1
- ret ; 1
-
- 00004$:
-#if USE_PDATA_PAGING_REGISTER
- pop acc
- mov dph,__XPAGE ; __XPAGE (usually p2) holds high byte for pdata access
- movx @dptr,a
-#else
- pop acc ; 2
- push ar0 ; 2
- mov r0,dpl ; 2
- movx @r0,a ; 1
- pop ar0 ; 2
-#endif
- ret ; 1
- ;===
- ;46 bytes
- __endasm;
-}
#endif
#ifdef SDCC_ds390
-#if 1
-
void
_gptrputWord ()
{
__endasm;
}
-#else
-
-void
-_gptrputWord ()
-{
- __asm
- push acc
- ;
- ; depending on the pointer type acc. to SDCCsymt.h
- ;
- mov a,b
- jz 00011$ ; 0 near
- dec a
- jz 00012$ ; 1 far
- dec a
- jz 00013$ ; 2 code
- dec a
- jz 00014$ ; 3 pdata
- dec a ; 4 skip generic pointer
- dec a
- jz 00011$ ; 5 idata
- pop acc
- sjmp 00016$
-;
-; store into near space
-;
- 00011$:
- pop acc
- push ar0
- mov r0,dpl
- mov @r0,_ap
- inc r0
- mov @r0,a
- sjmp 00015$
-
- 00012$:
- mov a, _ap
- movx @dptr,a
- inc dptr
- pop acc
- movx @dptr,a
- sjmp 00016$
-
- 00013$:
- pop acc ; do nothing
- sjmp 00016$
-
- 00014$:
- pop acc
- push ar0
- mov r0,dpl
- xch a,_ap
- movx @r0,a
- inc r0
- xch a,_ap
- movx @r0, a
- 00015$:
- inc dptr
- pop ar0
- 00016$:
- __endasm;
-}
-#endif
-
#endif
_startLazyDPSEvaluation();
if (shCount == 1)
{
- shiftRLong (left, MSB16, result, sign);
+ shiftRLong (left, MSB16, result, sign);
}
else if (shCount == 0)
{
// with the implementation of __gptrgetWord
// in device/lib/_gptrget.c
emitcode ("lcall", "__gptrgetWord");
- aopPut (result, DP2_RESULT_REG, offset++);
aopPut (result, "a", offset++);
+ aopPut (result, DP2_RESULT_REG, offset++);
size--;
}
else
--- /dev/null
+/*
+ bug 1714204
+*/
+
+#include <testfwk.h>
+
+typedef struct {
+ unsigned int w[2];
+} TEST_TYPE;
+
+unsigned char i1, i2, i3;
+
+void test(TEST_TYPE *p1, TEST_TYPE *p2, TEST_TYPE *p3)
+{
+ if (p2->w[i2] > ++p3->w[i3])
+ p1->w[i1] = p2->w[i2] + p3->w[i3];
+}
+
+void
+testBug(void)
+{
+ TEST_TYPE t1 = { { 1, 1 } };
+ TEST_TYPE t2 = { { 1, 1 } };
+ TEST_TYPE t3 = { { 1, 1 } };
+
+ i1 = i2 = i3 = 0;
+
+ test(&t1, &t2, &t3);
+
+ ASSERT (t1.w[0] == 1);
+}
projects / fw / sdcc / commitdiff