X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=src%2Fregression%2Fcompare9.c;h=96e7682766b82463b1f28e8213137369af9f5ed1;hb=bb226788dab3832b0ec0cda70874ce3fce4eebc6;hp=6f79bc168774a4e23c9f3da331c66abbfec69a12;hpb=c2669053120ee399168b6a7c44e7087abb0115b7;p=fw%2Fsdcc

diff --git a/src/regression/compare9.c b/src/regression/compare9.c
index 6f79bc16..96e76827 100644
--- a/src/regression/compare9.c
+++ b/src/regression/compare9.c
@@ -1,3 +1,5 @@
+#include "gpsim_assert.h"
+#include "picregs.h"
 // Signed comparisons of the form:  (variable<=LIT)
 //
 // This regression test exercises all of the boundary
@@ -6,9 +8,7 @@
 // and each one has an astonishing capability of failing
 // a boundary condition.
 
-unsigned char success = 0;
 unsigned char failures = 0;
-unsigned char dummy = 0;
 unsigned char result = 0;
 
 int int0 = 0;
@@ -16,31 +16,6 @@ int int1 = 0;
 signed char char0 = 0;
 signed char char1 = 0;
 
-/* copied from 16f877.inc file supplied with gpasm */
-
-#define _CP_ALL          0x0FCF
-#define _CP_HALF         0x1FDF
-#define _CP_UPPER_256    0x2FEF
-#define _CP_OFF          0x3FFF
-#define _DEBUG_ON        0x37FF
-#define _DEBUG_OFF       0x3FFF
-#define _WRT_ENABLE_ON   0x3FFF
-#define _WRT_ENABLE_OFF  0x3DFF
-#define _CPD_ON          0x3EFF
-#define _CPD_OFF         0x3FFF
-#define _LVP_ON          0x3FFF
-#define _LVP_OFF         0x3F7F
-#define _BODEN_ON        0x3FFF
-#define _BODEN_OFF       0x3FBF
-#define _PWRTE_OFF       0x3FFF
-#define _PWRTE_ON        0x3FF7
-#define _WDT_ON          0x3FFF
-#define _WDT_OFF         0x3FFB
-#define _LP_OSC          0x3FFC
-#define _XT_OSC          0x3FFD
-#define _HS_OSC          0x3FFE
-#define _RC_OSC          0x3FFF
-
 /* *** NOTE ***  This particular test takes quite a while to run 
  * ~ 10,000,000 instruction cycles. (2.5 seconds on a 20Mhz PIC).
  * The WDT will reset the CPU if it's enabled. So disable it...
@@ -48,15 +23,15 @@ signed char char1 = 0;
 
 typedef unsigned int word;
 
-word at 0x2007  CONFIG = _WDT_OFF & _PWRTE_ON;
+//word at 0x2007  CONFIG = wdt_off & pwrte_on;
 
 void
-done ()
+done()
 {
-  dummy++;
+  ASSERT(MANGLE(failures) == 0);
+  PASSED();
 }
 
-
 void c_char_lte_lit1(unsigned char expected_result)
 {
   result = 0;
@@ -323,6 +298,5 @@ main (void)
   int_compare1();
   int_compare2();
 
-  success = failures;
   done ();
 }