It boots!

.gitignore

@@ -1,4 +1,7 @@
+build/
+sdkconfig.old
+
 rom.bin
 rom/
 *.o
-tme
+components/tme/tme

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "Musashi"]
-	path = musashi
+	path = components/tme/musashi
 	url = https://github.com/kstenerud/Musashi.git

Makefile

@@ -1,19 +1,9 @@
-TARGET:=tme
-MUSASHI_GEN_SRC:=musashi/m68kops.c musashi/m68kopac.c musashi/m68kopdm.c musashi/m68kopnz.c
-OBJ:=$(MUSASHI_GEN_SRC:%.x=%.o) musashi/m68kcpu.o  main.o emu.o disp.o iwm.o via.o rtc.o ncr.o hd.o
-#musashi/m68kdasm.o
-CFLAGS=-Wall -I. -I./musashi -Og -ggdb `sdl2-config --cflags`
-LDFLAGS=`sdl2-config --libs`
+#
+# This is a project Makefile. It is assumed the directory this Makefile resides in is a
+# project subdirectory.
+#
 
-$(TARGET): $(OBJ)
-	$(CC) -o $(@) $(CFLAGS) $(LDFLAGS) $^
+PROJECT_NAME := app-template
 
-$(MUSASHI_GEN_SRC): musashi/m68kmake
-	cd musashi; ../$(^)
+include $(IDF_PATH)/make/project.mk
 
-musashi/m68kmake: musashi/m68kmake.c
-	$(CC) -o $@ $^
-
-clean:
-	rm -f $(MUSASHI_GEN_SRC) musashi/m68kmake
-	rm -f $(OBJ) $(TARGET)

components/tme/disp.h

@@ -0,0 +1,4 @@
+#include <stdint.h>
+
+void dispInit();
+void dispDraw(uint8_t *mem);

components/tme/emu.c

@@ -6,7 +6,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/time.h>
-#include "config.h"
+#include "tmeconfig.h"
 #include "m68k.h"
 #include "disp.h"
 #include "iwm.h"
@@ -22,6 +22,7 @@ int rom_remap, video_remap=0, audio_remap=0;
 
 void m68k_instruction() {
 	unsigned int pc=m68k_get_reg(NULL, M68K_REG_PC);
+	printf("Mon: %x\n", pc);
 	int ok=0;
 	if (pc < 0x400000) {
 		if (rom_remap) {
@@ -96,30 +97,52 @@ void printFps() {
 	if (oldtv.tv_sec!=0) {
 		long msec=(tv.tv_sec-oldtv.tv_sec)*1000;
 		msec+=(tv.tv_usec-oldtv.tv_usec)/1000;
-		printf("Speed: %d%%\n", 100000/msec);
+		printf("Speed: %d%%\n", (int)(100000/msec));
 	}
 	oldtv.tv_sec=tv.tv_sec;
 	oldtv.tv_usec=tv.tv_usec;
 }
 
+typedef void (m68ki_instruction_jump_call)(void);
 
-void tmeStartEmu(void *rom) {
+m68ki_instruction_jump_call **m68ki_instruction_jump_table;
+unsigned char **m68ki_cycles;
+
+
+void tmeStartEmu(void *ram, void *rom) {
 	int ca1=0, ca2=0;
 	int x, frame=0;
 	macRom=rom;
-	macRam=malloc(TME_RAMSIZE);
+	macRam=ram;
+	printf("Allocating mem for m68k structs\n");
+	m68ki_instruction_jump_table=malloc(sizeof(*m68ki_instruction_jump_table)*0x10000);
+	m68ki_cycles=malloc(sizeof(*m68ki_cycles)*4);
+	m68ki_cycles[0]=malloc(sizeof(**m68ki_cycles)*0x10000);
+	m68ki_cycles[1]=malloc(sizeof(**m68ki_cycles)*0x10000);
+	m68ki_cycles[2]=malloc(sizeof(**m68ki_cycles)*0x10000);
+	if (m68ki_instruction_jump_table==NULL || m68ki_cycles[2]==NULL) {
+		printf("Malloc of 68k emu structs failed.\n");
+		abort();
+	}
+	printf("Clearing ram...\n");
 	for (int x=0; x<TME_RAMSIZE; x++) macRam[x]=0;
 	rom_remap=1;
+	printf("Creating HD and registering it...\n");
 	SCSIDevice *hd=hdCreate("hd.img");
 	ncrRegisterDevice(6, hd);
+	printf("Initializing m68k...\n");
 	viaClear(VIA_PORTA, 0x7F);
 	viaSet(VIA_PORTA, 0x80);
 	viaClear(VIA_PORTA, 0xFF);
 	viaSet(VIA_PORTB, (1<<3));
+	printf("Initializing m68k...\n");
 	m68k_init();
+	printf("Setting CPU type and resetting...");
 	m68k_set_cpu_type(M68K_CPU_TYPE_68000);
 	m68k_pulse_reset();
+	printf("Display init...\n");
 	dispInit();
+	printf("Done! Running.\n");
 	while(1) {
 		for (x=0; x<8000000/60; x+=10) {
 			m68k_execute(10);

components/tme/emu.h

@@ -0,0 +1,3 @@
+
+
+void tmeStartEmu(void *rom, void *ram);

components/tme/m68kconf.h

@@ -64,9 +64,9 @@
 /* ======================================================================== */
 
 /* Turn ON if you want to use the following M68K variants */
-#define M68K_EMULATE_010            OPT_ON
-#define M68K_EMULATE_EC020          OPT_ON
-#define M68K_EMULATE_020            OPT_ON
+#define M68K_EMULATE_010            OPT_OFF
+#define M68K_EMULATE_EC020          OPT_OFF
+#define M68K_EMULATE_020            OPT_OFF
 
 
 /* If ON, the CPU will call m68k_read_immediate_xx() for immediate addressing
@@ -131,9 +131,10 @@
 /* If ON, CPU will call the instruction hook callback before every
  * instruction.
  */
-#define M68K_INSTRUCTION_HOOK       OPT_SPECIFY_HANDLER
+//#define M68K_INSTRUCTION_HOOK       OPT_SPECIFY_HANDLER
+#define M68K_INSTRUCTION_HOOK       OPT_OFF
 #define M68K_INSTRUCTION_CALLBACK() m68k_instruction()
-
+void m68k_instruction();
 
 /* If ON, the CPU will emulate the 4-byte prefetch queue of a real 68000 */
 #define M68K_EMULATE_PREFETCH       OPT_OFF

components/tme/ncr.c

@@ -84,8 +84,6 @@ static const char* const stateNames[]={
 };
 
 static Ncr ncr;
-static SCSIDevice mydev;
-
 
 static void parseScsiCmd(int isRead) {
 	uint8_t *buf=ncr.data.cmd;

components/tme/ncr.h

@@ -4,7 +4,7 @@
 
 typedef struct {
 	uint8_t cmd[256];
-	uint8_t data[1024*1024];
+	uint8_t data[32*1024];
 	uint8_t msg[128];
 	int cmdlen;
 	int datalen;

components/tme/sdl/disp.c

@@ -23,7 +23,7 @@ void dispInit() {
 	drwsurf=SDL_CreateRGBSurfaceWithFormat(0, SCREEN_WIDTH, SCREEN_HEIGHT, 32, SDL_PIXELFORMAT_RGBA32);
 }
 
-void dispDraw(char *mem) {
+void dispDraw(uint8_t *mem) {
 	int x, y, z;
 	SDL_LockSurface(drwsurf);
 	uint32_t *pixels=(uint32_t*)drwsurf->pixels;

components/tme/sdl/main.c

@@ -6,7 +6,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
-#include "config.h"
+#include "tmeconfig.h"
 
 
 static void *loadRom(char *file) {
@@ -23,5 +23,6 @@ static void *loadRom(char *file) {
 
 int main(int argc, char **argv) {
 	void *rom=loadRom("rom.bin");
-	tmeStartEmu(rom);
+	void *ram=malloc(TME_RAMSIZE);
+	tmeStartEmu(ram, rom);
 }

config.h

@@ -1,10 +0,0 @@
-
-
-#define TME_ROMSIZE (128*1024)
-
-#define TME_RAMSIZE (4096*1024)
-
-#define TME_SCREENBUF (TME_RAMSIZE-0x5900)
-#define TME_SCREENBUF_ALT (TME_RAMSIZE-0xD900)
-
-

disp.h

@@ -1,2 +0,0 @@
-void dispInit();
-void dispDraw(char *mem);

emu.h

@@ -1,3 +0,0 @@
-
-
-void tmeStartEmu(void *rom);

flashhd.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#python /home/jeroen/esp8266/esp32/esp-idf/bin/esptool.py --chip esp32 --port "/dev/ttyUSB0" --baud 115200 write_flash -z -fs 32m 0x100000 doom1-cut.wad
+python /home/jeroen/esp8266/esp32/esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port "/dev/ttyUSB1" --baud $((921600/2)) --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x120000 $1
+

flashrom.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+#python /home/jeroen/esp8266/esp32/esp-idf/bin/esptool.py --chip esp32 --port "/dev/ttyUSB0" --baud 115200 write_flash -z -fs 32m 0x100000 doom1-cut.wad
+python /home/jeroen/esp8266/esp32/esp-idf/components/esptool_py/esptool/esptool.py --chip esp32 --port "/dev/ttyUSB1" --baud $((921600/2)) --before default_reset --after hard_reset write_flash --flash_mode dio --flash_freq 40m --flash_size detect 0x100000 rom.bin
+

partitions.csv

@@ -0,0 +1,6 @@
+# Espressif ESP32 Partition Table
+# Name,  Type, SubType, Offset,  Size
+factory, app,  factory, 0x10000, 928k
+wifidata,data, nvs,     0xFC000, 16K
+rom,     0x40,   0x01,  0x100000, 128K
+hd,      0x40,   0x02,  0x120000, 0x2e0000

sdkconfig

@@ -0,0 +1,218 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Espressif IoT Development Framework Configuration
+#
+
+#
+# SDK tool configuration
+#
+CONFIG_TOOLPREFIX="xtensa-esp32-elf-"
+CONFIG_PYTHON="python"
+
+#
+# Bootloader config
+#
+# CONFIG_LOG_BOOTLOADER_LEVEL_NONE is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_ERROR is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_WARN is not set
+CONFIG_LOG_BOOTLOADER_LEVEL_INFO=y
+# CONFIG_LOG_BOOTLOADER_LEVEL_DEBUG is not set
+# CONFIG_LOG_BOOTLOADER_LEVEL_VERBOSE is not set
+CONFIG_LOG_BOOTLOADER_LEVEL=3
+
+#
+# Security features
+#
+# CONFIG_SECURE_BOOT_ENABLED is not set
+# CONFIG_FLASH_ENCRYPTION_ENABLED is not set
+
+#
+# Serial flasher config
+#
+CONFIG_ESPTOOLPY_PORT="/dev/ttyUSB0"
+# CONFIG_ESPTOOLPY_BAUD_115200B is not set
+# CONFIG_ESPTOOLPY_BAUD_230400B is not set
+CONFIG_ESPTOOLPY_BAUD_921600B=y
+# CONFIG_ESPTOOLPY_BAUD_2MB is not set
+# CONFIG_ESPTOOLPY_BAUD_OTHER is not set
+CONFIG_ESPTOOLPY_BAUD_OTHER_VAL=115200
+CONFIG_ESPTOOLPY_BAUD=921600
+CONFIG_ESPTOOLPY_COMPRESSED=y
+# CONFIG_FLASHMODE_QIO is not set
+# CONFIG_FLASHMODE_QOUT is not set
+CONFIG_FLASHMODE_DIO=y
+# CONFIG_FLASHMODE_DOUT is not set
+CONFIG_ESPTOOLPY_FLASHMODE="dio"
+# CONFIG_ESPTOOLPY_FLASHFREQ_80M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
+# CONFIG_ESPTOOLPY_FLASHFREQ_26M is not set
+# CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
+CONFIG_ESPTOOLPY_FLASHFREQ="40m"
+# CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
+# CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
+CONFIG_ESPTOOLPY_FLASHSIZE_DETECT=y
+CONFIG_ESPTOOLPY_BEFORE_RESET=y
+# CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
+CONFIG_ESPTOOLPY_BEFORE="default_reset"
+CONFIG_ESPTOOLPY_AFTER_RESET=y
+# CONFIG_ESPTOOLPY_AFTER_NORESET is not set
+CONFIG_ESPTOOLPY_AFTER="hard_reset"
+# CONFIG_MONITOR_BAUD_9600B is not set
+# CONFIG_MONITOR_BAUD_57600B is not set
+CONFIG_MONITOR_BAUD_115200B=y
+# CONFIG_MONITOR_BAUD_230400B is not set
+# CONFIG_MONITOR_BAUD_921600B is not set
+# CONFIG_MONITOR_BAUD_2MB is not set
+# CONFIG_MONITOR_BAUD_OTHER is not set
+CONFIG_MONITOR_BAUD_OTHER_VAL=115200
+CONFIG_MONITOR_BAUD=115200
+
+#
+# Partition Table
+#
+# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
+# CONFIG_PARTITION_TABLE_TWO_OTA is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
+CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
+CONFIG_PARTITION_TABLE_CUSTOM_APP_BIN_OFFSET=0x10000
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
+CONFIG_APP_OFFSET=0x10000
+CONFIG_PHY_DATA_OFFSET=
+CONFIG_OPTIMIZATION_LEVEL_DEBUG=y
+# CONFIG_OPTIMIZATION_LEVEL_RELEASE is not set
+
+#
+# Component config
+#
+# CONFIG_BT_ENABLED is not set
+CONFIG_BT_RESERVE_DRAM=0
+
+#
+# ESP32-specific
+#
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_80 is not set
+# CONFIG_ESP32_DEFAULT_CPU_FREQ_160 is not set
+CONFIG_ESP32_DEFAULT_CPU_FREQ_240=y
+CONFIG_ESP32_DEFAULT_CPU_FREQ_MHZ=240
+CONFIG_MEMMAP_SMP=y
+# CONFIG_MEMMAP_TRACEMEM is not set
+CONFIG_TRACEMEM_RESERVE_DRAM=0x0
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_FLASH is not set
+# CONFIG_ESP32_ENABLE_COREDUMP_TO_UART is not set
+CONFIG_ESP32_ENABLE_COREDUMP_TO_NONE=y
+# CONFIG_ESP32_ENABLE_COREDUMP is not set
+CONFIG_MEMMAP_SPIRAM_ENABLE=y
+CONFIG_MEMMAP_SPIRAM_TYPE_ESPPSRAM32=y
+CONFIG_MEMMAP_SPIRAM_SIZE=4194304
+# CONFIG_MEMMAP_SPIRAM_NO_HEAPALLOC is not set
+CONFIG_MEMMAP_SPIRAM_TEST=y
+CONFIG_MEMMAP_SPIRAM_ENABLE_MALLOC=y
+CONFIG_MEMMAP_SPIRAM_ALLOC_LIMIT_INTERNAL=40960
+# CONFIG_TWO_MAC_ADDRESS_FROM_EFUSE is not set
+CONFIG_FOUR_MAC_ADDRESS_FROM_EFUSE=y
+CONFIG_NUMBER_OF_MAC_ADDRESS_GENERATED_FROM_EFUSE=4
+CONFIG_SYSTEM_EVENT_QUEUE_SIZE=32
+CONFIG_SYSTEM_EVENT_TASK_STACK_SIZE=4096
+CONFIG_MAIN_TASK_STACK_SIZE=4096
+CONFIG_NEWLIB_STDOUT_ADDCR=y
+# CONFIG_NEWLIB_NANO_FORMAT is not set
+CONFIG_CONSOLE_UART_DEFAULT=y
+# CONFIG_CONSOLE_UART_CUSTOM is not set
+# CONFIG_CONSOLE_UART_NONE is not set
+CONFIG_CONSOLE_UART_NUM=0
+CONFIG_CONSOLE_UART_BAUDRATE=115200
+# CONFIG_ULP_COPROC_ENABLED is not set
+CONFIG_ULP_COPROC_RESERVE_MEM=0
+# CONFIG_ESP32_PANIC_PRINT_HALT is not set
+# CONFIG_ESP32_PANIC_PRINT_REBOOT is not set
+# CONFIG_ESP32_PANIC_SILENT_REBOOT is not set
+CONFIG_ESP32_PANIC_GDBSTUB=y
+CONFIG_ESP32_DEBUG_OCDAWARE=y
+# CONFIG_INT_WDT is not set
+# CONFIG_TASK_WDT is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_RTC is not set
+CONFIG_ESP32_TIME_SYSCALL_USE_RTC_FRC1=y
+# CONFIG_ESP32_TIME_SYSCALL_USE_FRC1 is not set
+# CONFIG_ESP32_TIME_SYSCALL_USE_NONE is not set
+CONFIG_ESP32_RTC_CLOCK_SOURCE_INTERNAL_RC=y
+CONFIG_ESP32_DEEP_SLEEP_WAKEUP_DELAY=0
+# CONFIG_WIFI_ENABLED is not set
+# CONFIG_ETHERNET is not set
+
+#
+# FreeRTOS
+#
+# CONFIG_FREERTOS_UNICORE is not set
+CONFIG_FREERTOS_CORETIMER_0=y
+# CONFIG_FREERTOS_CORETIMER_1 is not set
+CONFIG_FREERTOS_HZ=100
+CONFIG_FREERTOS_ASSERT_ON_UNTESTED_FUNCTION=y
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_NONE is not set
+# CONFIG_FREERTOS_CHECK_STACKOVERFLOW_PTRVAL is not set
+CONFIG_FREERTOS_CHECK_STACKOVERFLOW_CANARY=y
+CONFIG_FREERTOS_WATCHPOINT_END_OF_STACK=y
+CONFIG_FREERTOS_THREAD_LOCAL_STORAGE_POINTERS=1
+CONFIG_FREERTOS_ASSERT_FAIL_ABORT=y
+# CONFIG_FREERTOS_ASSERT_FAIL_PRINT_CONTINUE is not set
+# CONFIG_FREERTOS_ASSERT_DISABLE is not set
+CONFIG_FREERTOS_BREAK_ON_SCHEDULER_START_JTAG=y
+# CONFIG_ENABLE_MEMORY_DEBUG is not set
+CONFIG_FREERTOS_ISR_STACKSIZE=2000
+# CONFIG_FREERTOS_LEGACY_HOOKS is not set
+CONFIG_FREERTOS_MAX_TASK_NAME_LEN=16
+# CONFIG_FREERTOS_DEBUG_INTERNALS is not set
+
+#
+# Log output
+#
+# CONFIG_LOG_DEFAULT_LEVEL_NONE is not set
+# CONFIG_LOG_DEFAULT_LEVEL_ERROR is not set
+# CONFIG_LOG_DEFAULT_LEVEL_WARN is not set
+CONFIG_LOG_DEFAULT_LEVEL_INFO=y
+# CONFIG_LOG_DEFAULT_LEVEL_DEBUG is not set
+# CONFIG_LOG_DEFAULT_LEVEL_VERBOSE is not set
+CONFIG_LOG_DEFAULT_LEVEL=3
+CONFIG_LOG_COLORS=y
+
+#
+# LWIP
+#
+# CONFIG_L2_TO_L3_COPY is not set
+CONFIG_LWIP_MAX_SOCKETS=10
+CONFIG_LWIP_THREAD_LOCAL_STORAGE_INDEX=0
+# CONFIG_LWIP_SO_REUSE is not set
+# CONFIG_LWIP_SO_RCVBUF is not set
+CONFIG_LWIP_DHCP_MAX_NTP_SERVERS=1
+# CONFIG_LWIP_IP_FRAG is not set
+# CONFIG_LWIP_IP_REASSEMBLY is not set
+CONFIG_TCP_MAXRTX=12
+CONFIG_TCP_SYNMAXRTX=6
+# CONFIG_LWIP_DHCP_DOES_ARP_CHECK is not set
+
+#
+# mbedTLS
+#
+CONFIG_MBEDTLS_SSL_MAX_CONTENT_LEN=16384
+# CONFIG_MBEDTLS_DEBUG is not set
+CONFIG_MBEDTLS_HARDWARE_AES=y
+CONFIG_MBEDTLS_HARDWARE_MPI=y
+CONFIG_MBEDTLS_MPI_USE_INTERRUPT=y
+CONFIG_MBEDTLS_HARDWARE_SHA=y
+CONFIG_MBEDTLS_HAVE_TIME=y
+# CONFIG_MBEDTLS_HAVE_TIME_DATE is not set
+
+#
+# OpenSSL
+#
+# CONFIG_OPENSSL_DEBUG is not set
+CONFIG_OPENSSL_ASSERT_DO_NOTHING=y
+# CONFIG_OPENSSL_ASSERT_EXIT is not set
+
+#
+# SPI Flash driver
+#
+# CONFIG_SPI_FLASH_ENABLE_COUNTERS is not set