use a separate build directory, better statistics

tenbaht · tenbaht · commit b75a79a33a76 · 2019-01-09T14:28:21.000+01:00
diff --git a/test/pinmode/Makefile b/test/pinmode/Makefile
@@ -15,19 +15,23 @@ CPPFLAGS=-DF_CPU=16000000L -DSTM8S103 -Ddouble=float \
 	-I. -I$(SDUINO) -I$(SDBASE)/variants/standard \
 	-I$(LIBBASE)/inc -I$(LIBBASE)/src \
 	-I$(SDCCBASE)/share/sdcc/include/
-CFLAGS= -mstm8 --debug
+CFLAGS= -mstm8 #--debug
 LDFLAGS=-L$(LIBBASE)/lib -L$(SDCCBASE)/share/sdcc/lib/stm8 -lSTM8S103
 
-OBJECTS=pinmode-c.rel pinmode-asm.rel main.rel
+SRCS=pinmode-c.c pinmode-asm.c main.c
+
+BUILDDIR=build
+OBJECTS=$(SRCS:%.c=$(BUILDDIR)/%.rel)
 
 .PHONY: all clean flash statistics
 
-#all: $(OBJECTS)
+all: $(EXECUTEABLE) statistics
 
 $(EXECUTABLE): $(OBJECTS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
 
-$(OBJECTS) : %.rel : %.c
+$(OBJECTS) : $(BUILDDIR)/%.rel : %.c
+	mkdir -p $(BUILDDIR)
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $^ -o $@
 
 flash: $(EXECUTABLE)
@@ -39,15 +43,15 @@ readopt:
 
 # lists the length of functions and constants defined in the primary source
 # file
-statistics:
-	awk '/ CODE/ {print FILENAME "\t" strtonum("0x"$$4)}' *.sym
+statistics: $(OBJECTS)
+	cd $(BUILDDIR); awk '/ CODE/ {print FILENAME "\t" strtonum("0x"$$4)}' *.sym
 
 
 #	grep "[0-9] _" $(BASENAME).rst |\
 #	awk 'BEGIN {print "length\tfunction\n------\t----------";}{ a=strtonum("0x"$$1);if (name) print a-s "\t" name; s=a; name=$$3}'
 
 
 clean: 
-	rm -f *.lib *.rst *.rel *.lst *.ihx *.sym *.asm *.lk *.map \
-		*.cdb *.adb *~ *.bak
+	rm -rf *.lib *.rst *.rel *.lst *.ihx *.sym *.asm *.lk *.map \
+		*.cdb *.adb *~ *.bak build
 	rm -f $(EXECUTABLE)
diff --git a/test/pinmode/main.c b/test/pinmode/main.c
@@ -4,20 +4,19 @@
 
 #define ARDUINO_MAIN
 #include "Arduino.h"
-#include "wiring_private.h"
 #include "stm8s_it.h"
 
 void pinMode_c(uint8_t pin, uint8_t mode);
 void pinMode_asm(uint8_t pin, uint8_t mode);
 
 
-uint8_t checkresult(uint8_t *adr, uint8_t *data)
+uint8_t checkresult(uint16_t adr, uint8_t *data)
 {
 	uint8_t i,ok;
 
 	ok = 1;
 	for (i=0; i<3; ++i) {
-		if (adr[2+i] != data[i]) ok=0;
+		if (((uint8_t*)adr)[2+i] != data[i]) ok=0;
 	}
 	return ok;
 }
diff --git a/test/pinmode/pinmode-asm.c b/test/pinmode/pinmode-asm.c
@@ -2,9 +2,7 @@
  * test spi functions
  */
 
-#include "Arduino.h"
-#include "wiring_private.h"
-
+#include <stdint.h>
 
 void pinMode_asm(uint8_t pin, uint8_t mode)
 {
diff --git a/test/pinmode/pinmode-c.c b/test/pinmode/pinmode-c.c
@@ -3,7 +3,6 @@
  */
 
 #include "Arduino.h"
-#include "wiring_private.h"
 
 void pinMode_c(uint8_t pin, uint8_t mode)
 {

Original file line number	Diff line number	Diff line change
`@@ -4,20 +4,19 @@`
`4`	`4`
`5`	`5`	`#define ARDUINO_MAIN`
`6`	`6`	`#include "Arduino.h"`
`7`		`-#include "wiring_private.h"`
`8`	`7`	`#include "stm8s_it.h"`
`9`	`8`
`10`	`9`	`void pinMode_c(uint8_t pin, uint8_t mode);`
`11`	`10`	`void pinMode_asm(uint8_t pin, uint8_t mode);`
`12`	`11`
`13`	`12`
`14`		`-uint8_t checkresult(uint8_t adr, uint8_t data)`
	`13`	`+uint8_t checkresult(uint16_t adr, uint8_t *data)`
`15`	`14`	`{`
`16`	`15`	`uint8_t i,ok;`
`17`	`16`
`18`	`17`	`ok = 1;`
`19`	`18`	`for (i=0; i<3; ++i) {`
`20`		`- if (adr[2+i] != data[i]) ok=0;`
	`19`	`+ if (((uint8_t*)adr)[2+i] != data[i]) ok=0;`
`21`	`20`	`}`
`22`	`21`	`return ok;`
`23`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,7 @@`
`2`	`2`	`* test spi functions`
`3`	`3`	`*/`
`4`	`4`
`5`		`-#include "Arduino.h"`
`6`		`-#include "wiring_private.h"`
`7`		`-`
	`5`	`+#include <stdint.h>`
`8`	`6`
`9`	`7`	`void pinMode_asm(uint8_t pin, uint8_t mode)`
`10`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@`
`3`	`3`	`*/`
`4`	`4`
`5`	`5`	`#include "Arduino.h"`
`6`		`-#include "wiring_private.h"`
`7`	`6`
`8`	`7`	`void pinMode_c(uint8_t pin, uint8_t mode)`
`9`	`8`	`{`