+#include <avr/io.h>, simple test for NEXT (just compile/disassm)

Author: githubgilhad

README.rst

@@ -49,6 +49,19 @@ This project builds memxFORTH directly from assembler and try to be memory-effec
 __attribute__((naked, noreturn)) void function_A(void) { ... ;EIJMP; }
 
 
+.. code::
+
+__attribute__((naked, noreturn))
+void jump_to(uint32_t addr) {
+__asm__ __volatile__ (
+"mov r30, r22\n\t"
+"mov r31, r23\n\t"
+"out %[_RAMPZ], r24\n\t"
+"eijmp\n\t"
+:
+: [_RAMPZ] "I" (_SFR_IO_ADDR(RAMPZ))
+);
+}
 
 
 License

SW/libs/FORTH/FORTH-Engine/FORTH-Engine.S

@@ -1,3 +1,4 @@
+#include <avr/io.h>
 #include "../FORTH-Defines/FORTH-Defines.h"
 ; r2+Y = IP
 
@@ -11,34 +12,34 @@ NEXT:
 // DT=*IP; IP++; jmp **DT
 sbrc IP_hlo,7; skip if 0x80 not set (=FLASH)
 rjmp 1f
-out RAMPZ, IP_hlo
+out _SFR_IO_ADDR(RAMPZ), IP_hlo
 movw ZL, IP_lo
 elpm DT_lo, Z+
 elpm DT_hi, Z+
 elpm DT_hlo, Z+
 adiw IP_lo, 3
 rjmp 2f
 1:
-ldd DT_lo, Y+
-ldd DT_hi, Y+
-ldd DT_hlo, Y+
+ld DT_lo, Y+
+ld DT_hi, Y+
+ld DT_hlo, Y+
 2:
 movw ZL, DT_lo
 sbrc DT_hlo,7
 rjmp 1f
-out RAMPZ, DT_hlo
+out _SFR_IO_ADDR(RAMPZ), DT_hlo
 elpm r24, Z+
 elpm r25, Z+
 elpm r23, Z+	// hlo
 movw ZL, r24
-out EIND, r23
+out _SFR_IO_ADDR(EIND), r23
 eijmp
 1:
 ldd r24, Z+0
 ldd r25, Z+1
 ldd r23, Z+2// hlo
 movw ZL, r24
-out EIND, r23
+out _SFR_IO_ADDR(EIND), r23
 eijmp
 ; === ====
 

SW/libs/FORTH/FORTH-Engine/FORTH-Engine.h

@@ -1,2 +1,8 @@
-; === NEXT uses EIJMP to move
+#ifndef FORTH_ENGINE_H
+#define FORTH_ENGINE_H
+// ; === NEXT uses EIJMP to move
+// __attribute__((naked, noreturn)) void NEXT();
+void NEXT();
 
+
+#endif

SW/progs/demo/serial_out/Makefile

@@ -60,7 +60,10 @@ $(TARGET).dis: $(BUILD)/$(TARGET).elf Makefile
 $(OBJDUMP) --disassemble --source --line-numbers --demangle -z --section=.text --section=.data --section=.bss $< > $@
 
 upload: $(BUILD)/$(TARGET).hex
-/usr/bin/avrdude -v -V -p atmega2560 -D -c wiring -b 115200 -P /dev/ttyACM0 -U flash:w:$<:i
+/usr/bin/avrdude -v -V -p $(MCU) -D -c wiring -b 115200 -P /dev/ttyACM0 -U flash:w:$<:i
+
+ispload: $(BUILD)/$(TARGET).hex
+/usr/bin/avrdude -v -V -p $(MCU) -c usbasp -b 115200 -U flash:w:$<:i
 
 monitor:
 picocom -b 115200 --flow n --noreset --quiet /dev/ttyACM0

SW/progs/test/FORTH_c_001/FORTH_c_001.c

@@ -0,0 +1,37 @@
+#include <avr/io.h>
+#include <avr/interrupt.h>
+// LIBS: Serial/usart0 FORTH/FORTH-Engine
+
+#include "Serial/usart0/usart0.h"
+#include "FORTH/FORTH-Engine/FORTH-Engine.h"
+
+
+void setup(void) {
+usart0_setup();
+DDRF = 0xFF;
+DDRK = 0xFF;
+sei();
+}
+
+void loop(void) {
+uint8_t rx_avail = RX0_Available();
+PORTK = rx_avail;
+
+uint8_t tx_used = TX0_Used();
+PORTF = tx_used;
+
+uint16_t ch = RX0_Read();
+if (ch >> 8) { // Pokud r25 != 0
+TX0_Write((char)(ch & 0xFF)); // Blokuje dokud není volno
+}
+__asm__ __volatile__ ("jmp NEXT \n\t");
+NEXT();
+}
+
+int main(void) {
+setup();
+while (1) {
+loop();
+}
+}
+

SW/progs/test/FORTH_c_001/Makefile

@@ -0,0 +1,66 @@
+BUILD ?= build-mega-atmega2560
+# MCU & nástroje
+MCU ?= atmega2560
+CC = avr-gcc
+OBJCOPY = avr-objcopy
+OBJDUMP = avr-objdump
+
+LIB_PREFIX = ../../../libs
+Ilibs = -I$(LIB_PREFIX)
+
+CFLAGS = -Os -mmcu=$(MCU) -std=gnu99 -ffreestanding -fno-exceptions -fno-unwind-tables $(Ilibs)
+ASFLAGS = -mmcu=$(MCU)
+LDFLAGS = -Wl,-Ttext=0
+
+SRC ?= $(notdir $(CURDIR)).c
+TARGET := $(notdir $(CURDIR))
+
+# ========== Automatická detekce knihoven ==========
+# Vyhledá řádky jako: .* LIBS: serial file
+
+LIB_NAMES := $(shell grep -o '\<LIBS:.*' $(SRC) | sed 's/^.*\<LIBS: //' | tr ' ' '\n' | sort -u)
+LIB_OBJS := $(foreach lib,$(LIB_NAMES),$(LIB_PREFIX)/$(lib)/$(BUILD)/$(notdir $(lib)).o)
+
+OBJS = $(BUILD)/$(TARGET).o $(LIB_OBJS)
+# OBJS=\
+$(LIB_PREFIX)/Serial/usart0/$(BUILD)/usart0.o \
+$(BUILD)/$(TARGET).o
+# ========== Build pravidla ==========
+
+all: $(BUILD)/$(TARGET).hex $(TARGET).dis | $(BUILD)/
+
+%/:
+mkdir -p $@
+
+$(BUILD)/$(TARGET).elf: $(OBJS) | $(BUILD)/
+$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS)
+define LIB_RULE_template
+$(LIB_PREFIX)/$(1)/$(BUILD)/$(notdir $(1)).o: $(LIB_PREFIX)/$(1)/*
+$(MAKE) -C $(LIB_PREFIX)/$(1) MCU=$(MCU) BUILD=$(BUILD) $(BUILD)/$(notdir $(1)).o
+endef
+
+$(BUILD)/%.o: %.c | $(BUILD)/
+$(CC) $(CFLAGS) -c $< -o $@
+
+$(BUILD)/%.o: %.S | $(BUILD)/
+$(CC) $(ASFLAGS) -c $< -o $@
+
+$(foreach lib,$(LIB_NAMES),$(eval $(call LIB_RULE_template,$(lib))))
+
+$(BUILD)/$(TARGET).hex: $(BUILD)/$(TARGET).elf
+$(OBJCOPY) -O ihex -R .eeprom $< $@
+
+$(TARGET).dis: $(BUILD)/$(TARGET).elf Makefile
+$(OBJDUMP) --disassemble --source --line-numbers --demangle -z --section=.text --section=.data --section=.bss $< > $@
+
+upload: $(BUILD)/$(TARGET).hex
+/usr/bin/avrdude -v -V -p atmega2560 -D -c wiring -b 115200 -P /dev/ttyACM0 -U flash:w:$<:i
+
+monitor:
+picocom -b 115200 --flow n --noreset --quiet /dev/ttyACM0
+
+upload_monitor: upload monitor
+
+clean:
+rm -f *.o *.elf *.hex *.dis 
+rm -rf $(BUILD)

SW/progs/test/FORTH_c_001/README.rst

@@ -0,0 +1,3 @@
+Simple USART echo, with LEDs on PortF and PortK showing usage of RX and TX buffers
+use speed 115200
+Rewritten to C, with prologue and INTs via __vector_xx