X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=src%2Fregression%2Fcompare7.c;h=5f0f6ad5aa29cce340ba28844fa00f3f5c9a65f3;hb=55cda8264b973a7fa1c5fb5d88069901405e2292;hp=d0f254eed00fcdce8dbf5bbc8ae78d7016938e02;hpb=3933e81dce0294a133bee29f0d1d329dbd1365e1;p=fw%2Fsdcc

diff --git a/src/regression/compare7.c b/src/regression/compare7.c
index d0f254ee..5f0f6ad5 100644
--- a/src/regression/compare7.c
+++ b/src/regression/compare7.c
@@ -1,5 +1,5 @@
-#define __16F873
-#include "p16f873.h"
+#include "gpsim_assert.h"
+#include "picregs.h"
 // Signed comparisons of the form:  (variable<LIT)
 //
 // This regression test exercises all of the boundary
@@ -8,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;
 
 //bit bit0 = 0;
@@ -22,31 +20,6 @@ char long0 = 0;
 char long1 = 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...
@@ -54,15 +27,15 @@ char long1 = 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_lt_lit1(unsigned char expected_result)
 {
   result = 0;
@@ -331,6 +304,5 @@ main (void)
   int_compare1();
   int_compare2();
 
-  success = failures;
   done ();
 }