@@ -107,5 +107,6 @@ if [ $norun = 1 ]; then exit; fi

 ./bin/uxn256emu -v

 ./bin/uxnasm projects/examples/devices/mouse.tal bin/mouse.rom

+./rom2erom.sh bin/mouse.rom bin/mouse.erom

-./bin/uxn256emu -2x bin/mouse.rom

+./bin/uxn256emu -2x bin/mouse.erom

new file mode 100755

@@ -0,0 +1,12 @@

+#!/bin/bash

+if [ "m$1" = "m" ] || [ "m$2" = "m" ] || [ ! -e "$1" ] || [ "m$1" == "m--help" ] ; then

+        echo "Syntax: $0 romfile.rom romfile.erom"

+        exit 1

+fi

+dirname=$(mktemp -d eromdata.tmpXXXX)

+cp "$1" $dirname/init.rom

+(cd $dirname && zip -0 result.erom init.rom )

+mv $dirname/result.erom "$2"

+rm -rf "$dirname"

+ls -l "$2"

+

@@ -18,7 +18,8 @@ WITH REGARD TO THIS SOFTWARE.

 extern char *boot_rom;

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

+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);

@@ -1,6 +1,7 @@

 #include <stdio.h>

 #include <time.h>

 #include <unistd.h>

+#include <sys/stat.h>

 #include "uxn.h"

@@ -61,6 +62,7 @@ typedef struct video_t {

 } video_t;

 typedef struct instance_t {

+        void *varvara;

         video_t *video;

         Uint8 dev[0x100];

         Uxn u;

@@ -76,18 +78,37 @@ typedef struct instance_t {

         Uint64 ms_interval;

 } instance_t;

+typedef struct romdir_t {

+        int sizename;

+        char *name;

+        long offset;

+        long csize;

+        int method;

+        char *data;

+} romdir_t;

+

 typedef struct varvara_t {

         video_t video;

         int sizeinstances;

+        long sizeromdata;

+        char *romdata;

+        int sizeromdir;

+        romdir_t *romdir;

         instance_t **instances;

 } varvara_t;

 varvara_t *varvara_init(char *romfilename, int flag_fullscreen, int zoom);

+int varvara_romdata2romdir(varvara_t *varvara);

 void varvara_free(varvara_t *varvara);

-instance_t *instance_init(video_t *video);

+char *varvara_romdata(varvara_t *varvara,char *romdirname);

+int varvara_sizeromdata(varvara_t *varvara,char *romdirname);

+

+instance_t *instance_init(varvara_t *varvara);

 void instance_free(instance_t *instance);

+static char *load_file(char *filename, long *loadedsize);

+static int is_extension(char *filename, char *extension);

 /* prototypes: devices */

@@ -138,11 +159,18 @@ varvara_init(char *romfilename, int flag_fullscreen, int zoom)

                 system_error("Init", "Failed to allocate varvara structs.");

                 return(NULL);

         }

-

+        if(is_extension(romfilename,".erom")

+           && ((varvara->romdata=load_file(romfilename,&(varvara->sizeromdata)))==NULL

+             || varvara_romdata2romdir(varvara)!=0)

+        ) {

+                varvara_free(varvara),varvara=NULL;

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

+                return(NULL);

+        }

         set_zoom(&(varvara->video),zoom, 0);

         set_flag_fullscreen(&(varvara->video), flag_fullscreen, 0);

         /* Start system. */

-        if((varvara->instances[0]=instance_init(&(varvara->video)))==NULL) {

+        if((varvara->instances[0]=instance_init(varvara))==NULL) {

                 varvara_free(varvara),varvara=NULL;

                 system_error("Init", "Failed to initialize varvara unx instance.");

                 return NULL;

@@ -154,8 +182,9 @@ 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, NULL, 0)

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

+          || !system_init(&(varvara->instances[0]->u), varvara->instances[0]->ram, varvara->instances[0]->rom, varvara_romdata(varvara,"init.rom"),varvara_sizeromdata(varvara,"init.rom"))

+          || !system_init(&(varvara->instances[0]->u_audio), varvara->instances[0]->ram, varvara->instances[0]->rom, varvara_romdata(varvara,"init.rom"),varvara_sizeromdata(varvara,"init.rom"))

+        ) {

                 varvara_free(varvara),varvara=NULL;

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

                 return(NULL);

@@ -168,6 +197,89 @@ varvara_init(char *romfilename, int flag_fullscreen, int zoom)

         return(varvara);

 }

+int

+varvara_romdata2romdir(varvara_t *varvara)

+{

+        int i;

+        unsigned char *start,*central,*end;

+        int nrecords,sizeregs,offset;

+        unsigned char *regsend,*ptr;

+        char *strerr;

+        romdir_t *romdir;

+        unsigned char *header;

+        int namelen,extralen;

+        if(varvara==NULL || varvara->romdata==NULL)

+                return(-1);

+        start=((unsigned char *)varvara->romdata);

+        end=start+varvara->sizeromdata;

+        /* look for end-of-zip directory */

+        for(i=varvara->sizeromdata-4;i>=0;i--) {

+                if(start[i]==0x50 && start[i+1]==0x4b && start[i+2]==0x05 && start[i+3]==0x06)

+                        break;

+        }

+        /* extract header */

+        if((strerr="without end-of-zip directory")==NULL

+          || i<0

+          || (strerr="with corrupt end-of-zip directory")==NULL

+          || (central=start+i+4)>=end

+          || (central+15)>=end

+          || (nrecords=central[6]|(central[7]<<8))<=0

+          || (sizeregs=central[8]|(central[9]<<8)|(central[10]<<16)|(central[11]<<24))<4

+          || (offset=central[12]|(central[13]<<8)|(central[14]<<16)|(central[15]<<24))<=0

+          || (regsend=start+offset+sizeregs)>end

+          || memcmp(start+offset,"\x50\x4b\x01\x02",4)!=0

+          || (strerr="couldn't be processed because of insufficient memory")==NULL

+          || (varvara->romdir=calloc(nrecords,sizeof(romdir_t)))==NULL

+        ) {

+                fprintf(stderr,"WARNING: erom %s\n",strerr);

+                return(-1); /* corrupt file or insuf. mem. */

+        }

+        /* parse entries */

+        for(i=0,ptr=start+offset+4;i<nrecords && ptr<(start+offset+sizeregs);i++) {

+                romdir=varvara->romdir+i;

+                if((strerr="is corrupt (too small)")==NULL

+                  || (ptr+25)>=regsend

+                  || (strerr="is corrupt (sizename is negative)")==NULL

+                  || (romdir->sizename=(ptr[24]|(ptr[25]<<8)))<0

+                  || (strerr="is corrupt (name too big)")==NULL

+                  || (ptr+42+romdir->sizename)>regsend

+                  || (strerr="is corrupt (name)")==NULL /* never used */

+                  || (romdir->name=((char *)ptr)+42)==NULL

+                  || (strerr="is corrupt (offset is negative)")==NULL

+                  || (romdir->offset=ptr[38]|(ptr[39]<<8)|(ptr[40]<<16)|(ptr[41]<<24))<0

+                  || (strerr="is corrupt (csize is negative)")==NULL

+                  || (romdir->csize=ptr[16]|(ptr[17]<<8)|(ptr[18]<<16)|(ptr[19]<<24))<0

+                  || (strerr="indicate compressed files but we require zips without compression (i.e. \"zip -0 myfile.erom init.rom\")")==NULL

+                  || (romdir->method=ptr[6]|(ptr[7]<<8))!=0

+                  || (strerr="is corrupt (data header)")==NULL

+                  || (header=start+romdir->offset)<0

+                  || (header+30)>central

+                  || (namelen=header[26]|(header[27]<<8))<0

+                  || (extralen=header[28]|(header[29]<<8))<0

+                  || (romdir->data=((char *)start)+romdir->offset+30+namelen+extralen)>((char *)central)

+                  || (romdir->data+romdir->csize)>((char *)central)

+                ) {

+                        fprintf(stderr,"WARNING: erom directory entry %s\n",strerr);

+                        free(varvara->romdir),varvara->romdir=NULL;

+                        return(-1); /* corrupt file or insuf. mem. */

+                }

+                /* search next entry */

+                for(;ptr<(start+offset+sizeregs-4);ptr++) {

+                        if(ptr[0]==0x50 && ptr[1]==0x4b && ptr[2]==0x01 && ptr[3]==0x02) {

+                                ptr+=4;

+                                break;

+                        }

+                }

+        }

+        if(i<nrecords) {

+                fprintf(stderr,"WARNING: erom with corrupt end-of-zip directory\n");

+                free(varvara->romdir),varvara->romdir=NULL;

+                return(-1); /* incomplete file */

+        }

+        varvara->sizeromdir=i;

+        return(0);

+}

+

 void

 varvara_free(varvara_t *varvara)

 {

@@ -182,17 +294,49 @@ varvara_free(varvara_t *varvara)

                 }

                 free(varvara->instances),varvara->instances=NULL,varvara->sizeinstances=0;

         }

+        if(varvara->romdata!=NULL)

+                free(varvara->romdata),varvara->romdata=NULL,varvara->sizeromdata=0;

         free(varvara),varvara=NULL;

 }

+char *

+varvara_romdata(varvara_t *varvara,char *romdirname)

+{

+        int i,l;

+        if(varvara==NULL || romdirname==NULL || varvara->romdata==NULL)

+                return(NULL);

+        l=strlen(romdirname);

+        for(i=0;i<varvara->sizeromdir;i++) {

+                if(varvara->romdir[i].sizename==l && memcmp(varvara->romdir[i].name,romdirname,l)==0)

+                        return(varvara->romdir[i].data);

+        }

+        return(NULL);

+}

+

+int

+varvara_sizeromdata(varvara_t *varvara,char *romdirname)

+{

+        int i,l;

+        if(varvara==NULL || romdirname==NULL || varvara->romdata==NULL)

+                return(0);

+        l=strlen(romdirname);

+        for(i=0;i<varvara->sizeromdir;i++) {

+                if(varvara->romdir[i].sizename==l && memcmp(varvara->romdir[i].name,romdirname,l)==0)

+                        return(varvara->romdir[i].csize);

+        }

+        return(0);

+}

+

+

 instance_t *

-instance_init(video_t *video)

+instance_init(varvara_t *varvara)

 {

         instance_t *instance;

         if((instance=malloc(sizeof(instance_t)))==NULL)

                 return(NULL);

         memset(instance,0,sizeof(instance_t));

-        instance->video=video;

+        instance->varvara=varvara;

+        instance->video=&(varvara->video);

         return(instance);

 }

@@ -209,6 +353,46 @@ instance_free(instance_t *instance)

         return;

 }

+static char *

+load_file(char *filename, long *loadedsize)

+{

+        FILE *fp;

+        struct stat st;

+        char *buf;

+        long filesize;

+        /* NOTE: we add a trailing zero byte to be able to return something if the file size is zero */

+        if((fp=fopen(filename,"rb"))==NULL

+          || fstat(fileno(fp),&st)!=0

+          || (filesize=st.st_size)!=st.st_size

+          || (buf=malloc(filesize+1))==NULL

+          || fread(buf,1,filesize,fp)!=filesize

+          || (buf[filesize]=0)!=0

+          || fclose(fp)!=0

+          || (fp=NULL)!=NULL

+        ) {

+                if(fp!=NULL)

+                        fclose(fp),fp=NULL;

+                return(NULL);

+        }

+        if(loadedsize!=NULL)

+                *loadedsize=filesize;

+        return(buf);

+}

+

+static int

+is_extension(char *filename, char *extension)

+{

+        /* NOTE: extension MUST include the leading dot, i.e. ".txt" */

+        int lfilename,lextension;

+        if(filename==NULL || extension==NULL)

+                return((filename==extension || extension==NULL)?1:0);

+        lfilename=strlen(filename);

+        lextension=strlen(extension);

+        if(lfilename>=lextension)

+                return((strcmp(filename+lfilename-lextension,extension)==0)?1:0);

+        return(0);

+}

+

 /* devices */

 static int

@@ -442,7 +626,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, NULL, 0);

+        system_reboot(u, rom, soft, varvara_romdata((varvara_t *)(instance->varvara),"init.rom"), varvara_sizeromdata((varvara_t *)(instance->varvara),"init.rom"));

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

 }