@@ -1,11 +1,13 @@

 #include <stdio.h>

 #include <stdlib.h>

+#include <string.h>

 #include "../uxn.h"

 #include "system.h"

 /*

 Copyright (c) 2022-2023 Devine Lu Linvega, Andrew Alderwick

+Copyright (c) 2024 Dario Rodriguez

 Permission to use, copy, modify, and distribute this software for any

 purpose with or without fee is hereby granted, provided that the above

@@ -19,86 +21,98 @@ char *boot_rom;

 Uint16 dev_vers[0x10];

 static int

-system_load(Uxn *u, char *filename)

+system_load(Uxn *u, char *filename, char *romdata, int sizeromdata)

 {

-	int l, i = 0;

-	FILE *f = fopen(filename, "rb");

-	if(!f)

-		return 0;

-	l = fread(&u->ram[PAGE_PROGRAM], 0x10000 - PAGE_PROGRAM, 1, f);

-	while(l && ++i < RAM_PAGES)

-		l = fread(u->ram + 0x10000 * i, 0x10000, 1, f);

-	fclose(f);

-	return 1;

+        int l, i = 0;

+        if(romdata==NULL) {

+                FILE *f = fopen(filename, "rb");

+                if(!f)

+                        return 0;

+                l = fread(&u->ram[PAGE_PROGRAM], 0x10000 - PAGE_PROGRAM, 1, f);

+                while(l && ++i < RAM_PAGES)

+                        l = fread(u->ram + 0x10000 * i, 0x10000, 1, f);

+                fclose(f);

+        } else {

+                if(sizeromdata<0)

+                        return 0;

+                l=sizeromdata;

+                l=(sizeromdata>(RAM_PAGES*0x10000-PAGE_PROGRAM))

+                  ?(RAM_PAGES*0x10000-PAGE_PROGRAM)

+                  :l;

+                memcpy(u->ram+PAGE_PROGRAM,romdata,l);

+        }

+        return 1;

 }

 static void

 system_print(Stack *s, char *name)

 {

-	Uint8 i;

-	fprintf(stderr, "%s ", name);

-	for(i = 0; i < 9; i++) {

-		Uint8 pos = s->ptr - 4 + i;

-		fprintf(stderr, !pos ? "[%02x]" : i == 4 ? "<%02x>"

-												 : " %02x ",

-			s->dat[pos]);

-	}

-	fprintf(stderr, "\n");

+        Uint8 i;

+        fprintf(stderr, "%s ", name);

+        for(i = 0; i < 9; i++) {

+                Uint8 pos = s->ptr - 4 + i;

+                fprintf(stderr, !pos ? "[%02x]" : i == 4 ? "<%02x>"

+                                                                                                 : " %02x ",

+                        s->dat[pos]);

+        }

+        fprintf(stderr, "\n");

 }

 int

 system_error(char *msg, const char *err)

 {

-	fprintf(stderr, "%s: %s\n", msg, err);

-	fflush(stderr);

-	return 0;

+        fprintf(stderr, "%s: %s\n", msg, err);

+        fflush(stderr);

+        return 0;

 }

 void

 system_inspect(Uxn *u)

 {

-	system_print(&u->wst, "wst");

-	system_print(&u->rst, "rst");

+        system_print(&u->wst, "wst");

+        system_print(&u->rst, "rst");

 }

 int

 system_version(char *name, char *date)

 {

-	printf("%s, %s.\n", name, date);

-	return 0;

+        printf("%s, %s.\n", name, date);

+        return 0;

 }

 void

 system_boot(Uxn *u, int soft)

 {

-	int i;

-	for(i = 0x100 * soft; i < 0x10000; i++)

-		u->ram[i] = 0;

-	for(i = 0x0; i < 0x100; i++)

-		u->dev[i] = 0;

-	u->wst.ptr = 0;

-	u->rst.ptr = 0;

+        int i;

+        for(i = 0x100 * soft; i < 0x10000; i++)

+                u->ram[i] = 0;

+        for(i = 0x0; i < 0x100; i++)

+                u->dev[i] = 0;

+        u->wst.ptr = 0;

+        u->rst.ptr = 0;

 }

 void

-system_reboot(Uxn *u, char *rom, int soft)

+system_reboot(Uxn *u, char *rom, int soft, char *romdata, int sizeromdata)

 {

-	system_boot(u, soft);

-	if(system_load(u, boot_rom))

-		if(uxn_eval(u, PAGE_PROGRAM))

-			boot_rom = rom;

+        system_boot(u, soft);

+        if(system_load(u, boot_rom, romdata, sizeromdata)) {

+                if(uxn_eval(u, PAGE_PROGRAM))

+                        boot_rom = rom;

+        }

 }

 int

-system_init(Uxn *u, Uint8 *ram, char *rom)

+system_init(Uxn *u, Uint8 *ram, char *rom, char *romdata, int sizeromdata)

 {

-	u->ram = ram;

-	system_boot(u, 0);

-	if(!system_load(u, rom))

-		if(!system_load(u, "boot.rom"))

-			return system_error("Init", "Failed to load rom.");

-	boot_rom = rom;

-	return 1;

+        u->ram = ram;

+        system_boot(u, 0);

+        if(!system_load(u, rom, romdata, sizeromdata)

+          && !system_load(u, "boot.rom", romdata, sizeromdata)) {

+                return system_error("Init", "Failed to load rom.");

+        }

+        boot_rom = rom;

+        return 1;

 }

 /* IO */

@@ -106,39 +120,39 @@ system_init(Uxn *u, Uint8 *ram, char *rom)

 Uint8

 system_dei(Uxn *u, Uint8 addr)

 {

-	switch(addr) {

-	case 0x4: return u->wst.ptr;

-	case 0x5: return u->rst.ptr;

-	default: return u->dev[addr];

-	}

+        switch(addr) {

+        case 0x4: return u->wst.ptr;

+        case 0x5: return u->rst.ptr;

+        default: return u->dev[addr];

+        }

 }

 void

 system_deo(Uxn *u, Uint8 *d, Uint8 port)

 {

-	Uint8 *ram;

-	Uint16 addr;

-	switch(port) {

-	case 0x3:

-		ram = u->ram;

-		addr = PEEK2(d + 2);

-		if(ram[addr] == 0x1) {

-			Uint16 i, length = PEEK2(ram + addr + 1);

-			Uint16 a_page = PEEK2(ram + addr + 1 + 2), a_addr = PEEK2(ram + addr + 1 + 4);

-			Uint16 b_page = PEEK2(ram + addr + 1 + 6), b_addr = PEEK2(ram + addr + 1 + 8);

-			int src = (a_page % RAM_PAGES) * 0x10000, dst = (b_page % RAM_PAGES) * 0x10000;

-			for(i = 0; i < length; i++)

-				ram[dst + (Uint16)(b_addr + i)] = ram[src + (Uint16)(a_addr + i)];

-		}

-		break;

-	case 0x4:

-		u->wst.ptr = d[4];

-		break;

-	case 0x5:

-		u->rst.ptr = d[5];

-		break;

-	case 0xe:

-		system_inspect(u);

-		break;

-	}

+        Uint8 *ram;

+        Uint16 addr;

+        switch(port) {

+        case 0x3:

+                ram = u->ram;

+                addr = PEEK2(d + 2);

+                if(ram[addr] == 0x1) {

+                        Uint16 i, length = PEEK2(ram + addr + 1);

+                        Uint16 a_page = PEEK2(ram + addr + 1 + 2), a_addr = PEEK2(ram + addr + 1 + 4);

+                        Uint16 b_page = PEEK2(ram + addr + 1 + 6), b_addr = PEEK2(ram + addr + 1 + 8);

+                        int src = (a_page % RAM_PAGES) * 0x10000, dst = (b_page % RAM_PAGES) * 0x10000;

+                        for(i = 0; i < length; i++)

+                                ram[dst + (Uint16)(b_addr + i)] = ram[src + (Uint16)(a_addr + i)];

+                }

+                break;

+        case 0x4:

+                u->wst.ptr = d[4];

+                break;

+        case 0x5:

+                u->rst.ptr = d[5];

+                break;

+        case 0xe:

+                system_inspect(u);

+                break;

+        }

 }

@@ -1,5 +1,6 @@

 /*

 Copyright (c) 2022 Devine Lu Linvega, Andrew Alderwick

+Copyright (c) 2024 Dario Rodriguez

 Permission to use, copy, modify, and distribute this software for any

 purpose with or without fee is hereby granted, provided that the above

@@ -17,11 +18,11 @@ WITH REGARD TO THIS SOFTWARE.

 extern char *boot_rom;

-void system_reboot(Uxn *u, char *rom, int soft);

+void system_reboot(Uxn *u, char *rom, int soft, char *romdata, int sizeromdata);

 void system_inspect(Uxn *u);

 int system_version(char *emulator, char *date);

 int system_error(char *msg, const char *err);

-int system_init(Uxn *u, Uint8 *ram, char *rom);

+int system_init(Uxn *u, Uint8 *ram, char *rom, char *romdata, int sizeromdata);

 Uint8 system_dei(Uxn *u, Uint8 addr);

 void system_deo(Uxn *u, Uint8 *d, Uint8 port);

@@ -154,8 +154,8 @@ varvara_init(char *romfilename, int flag_fullscreen, int zoom)

         if((varvara->instances[0]->ram=(Uint8 *)calloc(0x10000 * RAM_PAGES, sizeof(Uint8)))==NULL

           || (varvara->instances[0]->rom=(char *)malloc(strlen(romfilename)+1))==NULL

           || memcpy(varvara->instances[0]->rom,romfilename,strlen(romfilename)+1)==NULL

-          || !system_init(&(varvara->instances[0]->u), varvara->instances[0]->ram, varvara->instances[0]->rom)

-          || !system_init(&(varvara->instances[0]->u_audio), varvara->instances[0]->ram, varvara->instances[0]->rom)) {

+          || !system_init(&(varvara->instances[0]->u), varvara->instances[0]->ram, varvara->instances[0]->rom, NULL, 0)

+          || !system_init(&(varvara->instances[0]->u_audio), varvara->instances[0]->ram, varvara->instances[0]->rom, NULL, 0)) {

                 varvara_free(varvara),varvara=NULL;

                 system_error("Init", "Failed to initialize uxn.");

                 return(NULL);

@@ -442,7 +442,7 @@ emu_restart(Uxn *u, char *rom, int soft)

         screen_resize(u,WIDTH, HEIGHT);

         screen_fill(uxn_screen.bg, 0);

         screen_fill(uxn_screen.fg, 0);

-        system_reboot(u, rom, soft);

+        system_reboot(u, rom, soft, NULL, 0);

         SDL_SetWindowTitle(instance->video->emu_window, boot_rom);

 }