porting sdcc build system

Author: nulllab

boards.txt

@@ -1,7 +1,7 @@
 menu.cpu=Processor
 menu.clock_source=Clock source(MHz)
 menu.cpu_speed=CPU Frequency(MHz)
-menu.mode=Mode
+menu.mode=Memory Model
 menu.intlib=Link libs
 menu.floatlib=float lib
 menu.userlib=user lib
@@ -17,12 +17,22 @@ stc89c52_duino.upload.maximum_idata_size=256
 stc89c52_duino.upload.maximum_xdata_size=8192
 
 stc89c52_duino.build.core=STC89
+stc89c52_duino.build.extlib=-llibint -lliblong
 stc89c52_duino.build.variant=STC89
 stc89c52_duino.build.board=stc89c52_duino 
 stc89c52_duino.build.mcu=STC89C52RC
 stc89c52_duino.build.clock_source=16M
 stc89c52_duino.build.f_cpu=16000000L
 
+stc89c52_duino.menu.mode.large=large
+stc89c52_duino.menu.mode.large.build.stdlib=large
+stc89c52_duino.menu.mode.small=small
+stc89c52_duino.menu.mode.small.build.stdlib=small
+stc89c52_duino.menu.mode.medium=medium
+stc89c52_duino.menu.mode.medium.build.stdlib=medium
+stc89c52_duino.menu.mode.huge=huge
+stc89c52_duino.menu.mode.huge.build.stdlib=huge
+
 ########################## STC8F ####################################
 stc8.name=STC8A/G/H/F
 

cores/STC89/Arduino.h

@@ -17,20 +17,23 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
   Modified 2 February 2018 for MSC51 by huaweiwx 
+  Modified 2 February 2018 for stc89c52 by nulllab-jun
 */
 
 #ifndef Arduino_h
 #define Arduino_h
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <stdbool.h>
+#include <stdint.h>
 #include <string.h>
 #include <math.h>
-#include "utils/compatible.h"
-#include "xmacro.h"
-#include "mcu.h"
+//#include "utils/compatible.h"
+//#include "xmacro.h"
+#include "bsp/STC89C5xRC.h"
+#include <compiler.h>
 #include "pins_arduino.h"
-#include "bsp/bsp.h"
 
 // FIXME: workarounds for missing features or unimplemented functions
 // cancel out the PROGMEM attribute - used only for atmel CPUs
@@ -103,8 +106,8 @@ void yield(void);
 #define degrees(rad) ((rad)*RAD_TO_DEG)
 #define sq(x) ((x)*(x))
 
-#define interrupts()   sei()
-#define noInterrupts() cli()
+#define interrupts()   EA = 1
+#define noInterrupts() EA = 0
 
 #define clockCyclesPerMicrosecond() ( F_CPU / 1000000L )
 #define clockCyclesPerMillisecond() ( F_CPU / 1000L )
@@ -158,9 +161,6 @@ void yield(void);
 #define END_CRITICAL
 */
 
-
-
-
 // #define bit(b) (1UL << (b)) sdcc bit is __bit keywords
 
 //typedef bool        boolean;
@@ -175,19 +175,19 @@ void serialEvent(void);		// weak
 
 #include "wiring_digital.h"
 
-int analogRead(uint8_t pin);
-void analogReference(uint8_t mode);
-void analogWrite(uint8_t pin, int val);
+int analogRead(uint8_t);
+void analogReference(uint8_t);
+void analogWrite(uint8_t, int);
 
 #include "wiring.h"
 
-unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
-unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
+unsigned long pulseIn(uint8_t, uint8_t, unsigned long);
+unsigned long pulseInLong(uint8_t, uint8_t, unsigned long);
 
-void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
-uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+//void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+//uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
 
-void attachInterrupt(uint8_t, void (*)(void), int mode);
+void attachInterrupt(uint8_t, void (*)(void), int);
 void detachInterrupt(uint8_t);
 
 void setup(void);
@@ -216,6 +216,11 @@ void loop(void);
 
 #define NOT_A_PIN  0xff
 #define NOT_A_PORT 0xff
+#define ARDUINO_PINMASK   0x08
+#define ARDUINO_PORTMASK  0x80
+#define NOT_A_PORTPIN(x)  ((x)&(ARDUINO_PORTMASK|ARDUINO_PINMASK))
+#define IS_A_PIN(x)       !NOT_A_PORTPIN(x)
+
 
 #define NOT_AN_INTERRUPT -1
 

cores/STC89/HardwareSerial.c

@@ -25,10 +25,14 @@
   Modified 15 December 2016 by Michael Mayer
 
   Modified 2 February 2018 for mcs51 by huaweiwx
+  Review 2021 for stc89c52rc by nulllab-jun
 */
 
 #include "Arduino.h"
-
+#include "bsp/STC89C5xRC.h"
+#include "bsp/mcu.h"
+#include "bsp/compatible.h"
+#define MENU_SERIAL 1
 
 // private data //////////////////////////////////////////////////////////////
 
@@ -52,9 +56,19 @@ typedef struct {
 } RINGBUF_TypeDef;
 #endif
 
-extern void uart_init0(unsigned long baud);
+/*如果uart工作于模式0或模式2,此时可以不占用定时器*/
+void uart_init0(unsigned long baud)
+{
+    SCON = 0x50;            //8-bit variable UART
+    TMOD = 0x20;            //Set Timer1 as 8-bit auto reload mode
+    TH1 = TL1 = -(F_CPU/12/32/baud); //Set auto-reload vaule
+    TR1 = 1;                //Timer1 start run
+    ES = 1;                 //Enable UART interrupt
+    EA = 1;                 //Open master interrupt switch
+}
+//extern void uart_init0(unsigned long baud);
 
-static XDATA(RINGBUF_TypeDef,rxBuf);// = { { 0 }, 0, 0};
+static XDATA(RINGBUF_TypeDef, rxBuf);// = { { 0 }, 0, 0};
 static bool initialized; //=0 internal status. Returned on HardwareSerial()
 
 // private functions  ////////////////////////////////////////////////////////
@@ -83,7 +97,7 @@ static void storeChar(uint8_t c, RINGBUF_TypeDef *buf)
 
 #if (MENU_SERIAL == 1)
 #define InitialUARTx(x)  \
-  attachInterrupt(UART_IRQn,UART_IRQHandler,0); \
+  attachInterrupt(UART_IRQn, UART_IRQHandler, 0); \
   uart_init0(x)
 
 
@@ -146,7 +160,7 @@ void HardwareSerial_end(void)
 
 int HardwareSerial_available(void)
 {
-  unsigned int rtn;	
+  unsigned int rtn;
   noInterrupts();
   rtn = (rxBuf.size + rxBuf.head - rxBuf.tail) % rxBuf.size;
   interrupts();  
@@ -155,7 +169,7 @@ int HardwareSerial_available(void)
 
 int HardwareSerial_peek(void)
 {
-  int rtn;	
+  int rtn;
   noInterrupts();
   if (rxBuf.head == rxBuf.tail) {
     rtn = -1;
@@ -168,7 +182,7 @@ int HardwareSerial_peek(void)
 
 int HardwareSerial_read(void)
 {
-  int rtn;	
+  int rtn;
   noInterrupts();
   if (rxBuf.head == rxBuf.tail) {
     rtn = -1;

cores/STC89/WInterrupts.c

@@ -1,13 +1,15 @@
 // for stc89
 
 #include "Arduino.h"
-
-
+#include <compiler.h>
+#include "bsp/compatible.h"
 #define INTERRUPT_NUMS    6
 
-XDATA(voidFuncPtr,callback[INTERRUPT_NUMS]) = {NULL};
+typedef void    (*voidFuncPtr)(void);
+
+XDATA(voidFuncPtr, callback[INTERRUPT_NUMS]) = {NULL};
 
-#define INTERRUPT_ISR(a,b)  INTERRUPT(a,b){if (callback[b]) callback[b]();}                          
+#define INTERRUPT_ISR(a,b)  INTERRUPT(a,b){if (callback[b]) callback[b]();}
 
 INTERRUPT_ISR(int0_isr,   0)
 INTERRUPT_ISR(timer0_isr, 1)
@@ -18,15 +20,15 @@ INTERRUPT_ISR(timer2_isr, 5)
 
 void attachInterrupt(uint8_t interruptNum, void (*userFunc)(void), int mode)
 {
-  if(interruptNum < INTERRUPT_NUMS) {
-	(void)mode;                            /*UNUSED*/
+  if (interruptNum < INTERRUPT_NUMS) {
+    (void)mode;                            /*UNUSED*/
     callback[interruptNum] = userFunc;
   }
 }
 
 void detachInterrupt(uint8_t interruptNum)
 {
-  if(interruptNum < INTERRUPT_NUMS) {
+  if (interruptNum < INTERRUPT_NUMS) {
     callback[interruptNum] = NULL;
   }
 }