From a17ba450b9682087cba004081cf359a1d49144d9 Mon Sep 17 00:00:00 2001
From: Vincent St-Amour <stamourv@iro.umontreal.ca>
Date: Fri, 24 Jul 2009 20:35:07 -0400
Subject: [PATCH] Fixed a couple of things for Hi-Tech C. Cleaned up the
 conditional compilation sections.

---
 bignums.c    |  2 +-
 picobit-vm.c |  2 +-
 picobit-vm.h | 31 ++++++++++++++++++++-----------
 primitives.c | 24 ++++--------------------
 4 files changed, 26 insertions(+), 33 deletions(-)

diff --git a/bignums.c b/bignums.c
index a5cba14..47f544d 100644
--- a/bignums.c
+++ b/bignums.c
@@ -55,7 +55,7 @@ integer norm (obj prefix, integer n) {
     }
     else if (obj_eq (n, NEG1)) {
       // -1 is an illegal literal in SIXPIC, thus the double negative
-      if (d >= (1<<digit_width) - (-MIN_FIXNUM)) {
+      if (d >= (1<<digit_width) - (- MIN_FIXNUM)) {
 	n = ENCODE_FIXNUM (d - (1<<digit_width));
 	continue;
       }
diff --git a/picobit-vm.c b/picobit-vm.c
index 1a12de8..ca7a8c0 100644
--- a/picobit-vm.c
+++ b/picobit-vm.c
@@ -283,7 +283,7 @@ int read_hex_file (char *filename)
 
 /*---------------------------------------------------------------------------*/
 
-#ifdef PICOBOARD2
+#ifdef ROBOT
 // no separate compilation
 #include "debug.c"
 #include "gc.c"
diff --git a/picobit-vm.h b/picobit-vm.h
index e7fdb8d..4919d32 100644
--- a/picobit-vm.h
+++ b/picobit-vm.h
@@ -45,6 +45,14 @@ typedef uint16 obj;
 #define ROBOT
 #endif
 
+#ifdef MCC18
+#define ROBOT
+#endif
+
+#ifdef SIXPIC
+#define ROBOT
+#endif
+
 #ifndef ROBOT
 #define WORKSTATION
 #endif
@@ -125,16 +133,14 @@ char buf [MAX_PACKET_SIZE]; // buffer for writing
 
 // error handling
 
-#ifdef PICOBOARD2
-#define ERROR(prim, msg) halt_with_error()
-#define TYPE_ERROR(prim, type) halt_with_error()
-#endif
-
 #ifdef WORKSTATION
 #define ERROR(prim, msg) error (prim, msg)
 #define TYPE_ERROR(prim, type) type_error (prim, type)
 void error (char *prim, char *msg);
 void type_error (char *prim, char *type);
+#else
+#define ERROR(prim, msg) halt_with_error()
+#define TYPE_ERROR(prim, type) halt_with_error()
 #endif
 
 /*---------------------------------------------------------------------------*/
@@ -159,28 +165,31 @@ void type_error (char *prim, char *type);
 #define OBJ_TO_RAM_ADDR(o,f) ((((o) - MIN_RAM_ENCODING) << 2) + (f))
 #define OBJ_TO_ROM_ADDR(o,f) ((((o) - MIN_ROM_ENCODING) << 2) + (CODE_START + 4 + (f)))
 
-#ifdef PICOBOARD2
 #ifdef SIXPIC
 #define ram_get(a) *(a+0x200)
 #define ram_set(a,x) *(a+0x200) = (x)
-#else
+#endif
+
+#ifdef MCC18
 #define ram_get(a) *(uint8*)(a+0x200)
 #define ram_set(a,x) *(uint8*)(a+0x200) = (x)
 #endif
-#endif
+
 #ifdef WORKSTATION
 uint8 ram_mem[RAM_BYTES + VEC_BYTES];
 #define ram_get(a) ram_mem[a]
 #define ram_set(a,x) ram_mem[a] = (x)
 #endif
 
-#ifdef  PICOBOARD2
-#ifndef SIXPIC
-// provided by SIXPIC
+#ifdef MCC18
 uint8 rom_get (rom_addr a){
   return *(rom uint8*)a;
 }
 #endif
+#ifdef HI_TECH_C
+uint8 rom_get (rom_addr a){
+  return flash_read(a);
+}
 #endif
 
 #ifdef WORKSTATION
diff --git a/primitives.c b/primitives.c
index 452283f..ec890cf 100644
--- a/primitives.c
+++ b/primitives.c
@@ -712,10 +712,8 @@ uint32 read_clock () {
   uint32 now = 0;
 
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   now = from_now( 0 );
 #endif
-#endif
 
 #ifdef WORKSTATION
 #ifdef _WIN32
@@ -752,10 +750,8 @@ void prim_motor () {
     ERROR("motor", "argument out of range");
 
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   MOTOR_set( a1, a2 );
 #endif
-#endif
 
 #ifdef WORKSTATION
   printf ("motor %d -> power=%d\n", a1, a2);
@@ -775,10 +771,8 @@ void prim_led () {
     ERROR("led", "argument out of range");
 
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   LED_set( a1, a2, a3 );
 #endif
-#endif
 
 #ifdef WORKSTATION
   printf ("led %d -> duty=%d period=%d\n", a1, a2, a3 );
@@ -798,10 +792,8 @@ void prim_led2_color () {
     ERROR("led2-colors", "argument out of range");
 
 #ifdef PICOBOARD2
-#ifndef SIXPIC
   LED2_color_set( a1 );
 #endif
-#endif
 
 #ifdef WORKSTATION
   printf ("led2-color -> %s\n", (a1==0)?"green":"red");
@@ -819,9 +811,9 @@ void prim_getchar_wait () {
   if (a2 < 1 || a2 > 3)
     ERROR("getchar-wait", "argument out of range");
 
-#ifdef PICOBOARD2
   arg1 = OBJ_FALSE;
-#ifndef SIXPIC
+  
+#ifdef PICOBOARD2
   {
     serial_port_set ports;
     ports = serial_rx_wait_with_timeout( a2, a1 );
@@ -829,7 +821,6 @@ void prim_getchar_wait () {
       arg1 = encode_int (serial_rx_read( ports ));
   }
 #endif
-#endif
 
 #ifdef WORKSTATION
 #ifdef _WIN32
@@ -854,11 +845,10 @@ void prim_putchar () {
     ERROR("putchar", "argument out of range");
 
 #ifdef  PICOBOARD2
-#ifdef SIXPIC
-  uart_write(a1);
-#else
   serial_tx_write( a2, a1 );
 #endif
+#ifdef SIXPIC
+  uart_write(a1);
 #endif
 
 #ifdef WORKSTATION
@@ -878,10 +868,8 @@ void prim_beep () {
     ERROR("beep", "argument out of range");
   
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   beep( a1, from_now( a2 ) );
 #endif
-#endif
 
 #ifdef WORKSTATION
   printf ("beep -> freq-div=%d duration=%d\n", a1, a2 );
@@ -902,10 +890,8 @@ void prim_adc () {
     ERROR("adc", "argument out of range");
 
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   x = adc( a1 );
 #endif
-#endif
 
 #ifdef WORKSTATION
   x = read_clock () & 255;
@@ -920,10 +906,8 @@ void prim_sernum () {
   uint16 x;
 
 #ifdef  PICOBOARD2
-#ifndef SIXPIC
   x = serial_num ();
 #endif
-#endif
 
 #ifdef WORKSTATION
   x = 0;
-- 
2.11.4.GIT