e8f6b397420f9d862e37f667982a7807fb79a18d

There are problems with standard includes since the paths are ambiguous
between host and AVR. Using absolute includes does not work for multi-platform
projects.
The solution is to remove all standard includes of the host system for the
core files since there is no reason why a core definition should require
standard includes from the host system. User interaction (status messages)
is the job of the simulator and not the core definitions.

- add CORE_CFLAGS (-nostdinc) to Makefile.common
- remove <stdio.h> from core definition files
- move init message from core definition files to avr_init() in sim_avr.c

Signed-off-by: Stephan Veigl <veigl@gmx.net>

diff --git a/Makefile.common b/Makefile.common
index 3658ae56c52865d85d9b65f40c042bae454f2a7d..813901fa481844529694d95d09d9c3fc0219c5ba 100644 (file)
--- a/Makefile.common
+++ b/Makefile.common
@@ -41,6 +41,7 @@ ARCH          = ${shell $(CC) -dumpmachine | sed -e 's/^x/i/' -e 's/\(.\).*/\1/'}
 
 CFLAGS         += -O2 -Wall
 CFLAGS         += -g
+CORE_CFLAGS    = -nostdinc
 
 ifeq (${shell uname}, Darwin)
 # gcc 4.2 from MacOS is really not up to scratch anymore 
@@ -119,11 +120,11 @@ endif
 # this rule has precedence
 ${OBJ}/sim_%.o : cores/sim_%.c
 ifeq ($(V),1)
-       $(CC) $(CPPFLAGS) $(CFLAGS) -MMD \
+       $(CC) $(CPPFLAGS) $(CFLAGS) $(CORE_CFLAGS) -MMD \
                ${AVR_CPPFLAGS} \
                $<  -c -o $@
 else
-       @$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS) -MMD \
+       @$(CC) $(CPPFLAGS) $(CFLAGS) $(CFLAGS) $(CORE_CFLAGS) -MMD \
                ${AVR_CPPFLAGS} \
                $<  -c -o $@
        @echo CORE $<

diff --git a/simavr/cores/sim_90usb162.c b/simavr/cores/sim_90usb162.c
index 9d70076be48595fe30a7a23651bc32e8d57570fe..3cdc647d36a4c88a61c54fb2a83ab4fd35d65c9b 100644 (file)
--- a/simavr/cores/sim_90usb162.c
+++ b/simavr/cores/sim_90usb162.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"

diff --git a/simavr/cores/sim_mega128.c b/simavr/cores/sim_mega128.c
index a182255f146e1a6a44d5f1fbed8522c681b71f06..355b94101a4c7d5dac8b3a4fc62f113939726ec4 100644 (file)
--- a/simavr/cores/sim_mega128.c
+++ b/simavr/cores/sim_mega128.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"
@@ -493,8 +492,6 @@ avr_kind_t mega128 = {
 void m128_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
-
-       printf("%s init\n", avr->mmcu);
        
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);

diff --git a/simavr/cores/sim_mega1280.c b/simavr/cores/sim_mega1280.c
index d2f7cc67aca6d4e6b65931d59c44c2bc00f226ae..9ed040c310608f627dc1055be4da49b628fb0cd5 100644 (file)
--- a/simavr/cores/sim_mega1280.c
+++ b/simavr/cores/sim_mega1280.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"
@@ -776,8 +775,6 @@ avr_kind_t mega1280 = {
 void m1280_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
-
-       //printf("%s init\n", avr->mmcu);
        
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);

diff --git a/simavr/cores/sim_mega1281.c b/simavr/cores/sim_mega1281.c
index bf42988c63de46a9c659fda53bb224b961057c04..a8a80bb411f4de34c6f301d6ef45b5dde5908d7b 100644 (file)
--- a/simavr/cores/sim_mega1281.c
+++ b/simavr/cores/sim_mega1281.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"
@@ -521,8 +520,6 @@ avr_kind_t mega1281 = {
 void m1281_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
-
-       printf("%s init\n", avr->mmcu);
        
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);

diff --git a/simavr/cores/sim_megax.c b/simavr/cores/sim_megax.c
index a9e3ca5adf0863eacb97efba60e7b011b8cb8f81..80528e03b870c72feddf76c8941dab92a3a774d2 100644 (file)
--- a/simavr/cores/sim_megax.c
+++ b/simavr/cores/sim_megax.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 
 
@@ -29,8 +28,6 @@ void mx_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);
        avr_watchdog_init(avr, &mcu->watchdog);

diff --git a/simavr/cores/sim_megax4.c b/simavr/cores/sim_megax4.c
index efd5ede886e6a72d6bd2bbe7887a69700fbf59c6..58500bda3bd7fe35edfee559d830ace0d74cbfc4 100644 (file)
--- a/simavr/cores/sim_megax4.c
+++ b/simavr/cores/sim_megax4.c
@@ -18,7 +18,7 @@
        You should have received a copy of the GNU General Public License
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
+
 #include "sim_avr.h"
 
 #include "sim_megax4.h"
@@ -26,8 +26,6 @@
 void mx4_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
-
-       printf("%s init\n", avr->mmcu);
        
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);

diff --git a/simavr/cores/sim_megax8.c b/simavr/cores/sim_megax8.c
index 423622f5fb9126518beaf8afa8477f4de8ed71a5..46a3519cf240379f4fe753c568da17918e7b51a0 100644 (file)
--- a/simavr/cores/sim_megax8.c
+++ b/simavr/cores/sim_megax8.c
@@ -18,7 +18,7 @@
        You should have received a copy of the GNU General Public License
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
+
 #include "sim_avr.h"
 
 #include "sim_megax8.h"
@@ -27,8 +27,6 @@ void mx8_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);
        avr_watchdog_init(avr, &mcu->watchdog);

diff --git a/simavr/cores/sim_megaxm1.c b/simavr/cores/sim_megaxm1.c
index 1e2d669ed86781e4e923c73fd40826be33129a22..ceefd53edacff6c4c62930e84afbf0968e44cc8e 100644 (file)
--- a/simavr/cores/sim_megaxm1.c
+++ b/simavr/cores/sim_megaxm1.c
@@ -18,7 +18,7 @@
        You should have received a copy of the GNU General Public License
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <stdio.h>
+
 #include "sim_avr.h"
 
 #include "sim_megaxm1.h"
@@ -27,8 +27,6 @@ void mxm1_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_flash_init(avr, &mcu->selfprog);
        avr_watchdog_init(avr, &mcu->watchdog);
@@ -47,6 +45,6 @@ void mxm1_init(struct avr_t * avr)
 void mxm1_reset(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
-       printf("%s reset\n", avr->mmcu);
+
        avr->data[ mcu->lin.r_linbtr] = 0x20;
 }

diff --git a/simavr/cores/sim_tiny13.c b/simavr/cores/sim_tiny13.c
index 796a4dc6e0c9cb5d64e6e69069ccf2353058885b..0df8739fbaa28cc196f61207b82b19da0925dc4f 100644 (file)
--- a/simavr/cores/sim_tiny13.c
+++ b/simavr/cores/sim_tiny13.c
@@ -20,7 +20,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include </usr/include/stdio.h>
 #include "sim_avr.h"
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"
@@ -134,8 +133,6 @@ static void init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_watchdog_init(avr, &mcu->watchdog);
        avr_extint_init(avr, &mcu->extint);

diff --git a/simavr/cores/sim_tiny2313.c b/simavr/cores/sim_tiny2313.c
index 54b9e7c1d7909d4513547f7ce35a1dd8c27f9c1f..54d2a46f2d07d1031a5ffd6491ce5dd1d5591e16 100644 (file)
--- a/simavr/cores/sim_tiny2313.c
+++ b/simavr/cores/sim_tiny2313.c
@@ -19,7 +19,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include </usr/include/stdio.h>
 #include "sim_core_declare.h"
 #include "avr_eeprom.h"
 #include "avr_watchdog.h"
@@ -226,8 +225,6 @@ static void init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_watchdog_init(avr, &mcu->watchdog);
        avr_extint_init(avr, &mcu->extint);

diff --git a/simavr/cores/sim_tinyx4.c b/simavr/cores/sim_tinyx4.c
index f9669bcfe72393867fd9ebd8c5cb641007cd2dfc..33d44c68d241e3ea673a5cf72887e63a876b2a9a 100644 (file)
--- a/simavr/cores/sim_tinyx4.c
+++ b/simavr/cores/sim_tinyx4.c
@@ -20,7 +20,6 @@
     along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 
 #include "sim_tinyx4.h"
@@ -29,8 +28,6 @@ void tx4_init(struct avr_t * avr)
 {
     struct mcu_t * mcu = (struct mcu_t*)avr;
 
-    printf("%s init\n", avr->mmcu);
-
     avr_eeprom_init(avr, &mcu->eeprom);
     avr_watchdog_init(avr, &mcu->watchdog);
     avr_extint_init(avr, &mcu->extint);

diff --git a/simavr/cores/sim_tinyx5.c b/simavr/cores/sim_tinyx5.c
index 13b7366fb3d1aa700d4b20f32ed8cb38b8ab9191..d698caa4486f1ba9d355c688591479faa7c870db 100644 (file)
--- a/simavr/cores/sim_tinyx5.c
+++ b/simavr/cores/sim_tinyx5.c
@@ -20,7 +20,6 @@
        along with simavr.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <stdio.h>
 #include "sim_avr.h"
 
 #include "sim_tinyx5.h"
@@ -29,8 +28,6 @@ void tx5_init(struct avr_t * avr)
 {
        struct mcu_t * mcu = (struct mcu_t*)avr;
 
-       printf("%s init\n", avr->mmcu);
-
        avr_eeprom_init(avr, &mcu->eeprom);
        avr_watchdog_init(avr, &mcu->watchdog);
        avr_extint_init(avr, &mcu->extint);

diff --git a/simavr/sim/avr_usb.h b/simavr/sim/avr_usb.h
index fe9337bdeaea1fb00b4ad5794162e1755d66c438..17e5c0dfc5d89bb253db81d7a50bd79727acb41c 100644 (file)
--- a/simavr/sim/avr_usb.h
+++ b/simavr/sim/avr_usb.h
@@ -43,7 +43,7 @@ enum {
 
 struct avr_io_usb {
        uint8_t pipe;   //[in]
-       size_t  sz;             //[in/out]
+       uint32_t  sz;           //[in/out]
        uint8_t * buf;  //[in/out]
 };
 #define AVR_IOCTL_USB_NAK -2

diff --git a/simavr/sim/sim_avr.c b/simavr/sim/sim_avr.c
index 1bc169dd387a08db60ca931b7fad391de396adb3..0eb7c9eab3566c9320cc014020b87fa59f4b1914 100644 (file)
--- a/simavr/sim/sim_avr.c
+++ b/simavr/sim/sim_avr.c
@@ -43,6 +43,8 @@ int avr_init(avr_t * avr)
 #ifdef CONFIG_SIMAVR_TRACE
        avr->trace_data = calloc(1, sizeof(struct avr_trace_data_t));
 #endif
+       
+       printf("%s init\n", avr->mmcu);
 
        // cpu is in limbo before init is finished.
        avr->state = cpu_Limbo;
@@ -81,6 +83,8 @@ void avr_terminate(avr_t * avr)
 
 void avr_reset(avr_t * avr)
 {
+       printf("%s reset\n", avr->mmcu);
+
        memset(avr->data, 0x0, avr->ramend + 1);
        _avr_sp_set(avr, avr->ramend);
        avr->pc = 0;