first attempt at fixing the VBE 1.2 fallback code

diff --git a/Makefile.dj b/Makefile.dj
index 6e80356..3b487f7 100644 (file)
--- a/Makefile.dj
+++ b/Makefile.dj
@@ -20,11 +20,11 @@ AS = $(TC)as
 
 warn = -pedantic -Wall -Wno-deprecated-declarations
 dbg = -g
-opt = -O3 -ffast-math
+opt = -O3 -ffast-math -fno-strict-aliasing
 inc = -Isrc
 def = -DNO_STDINT_H
 
-CFLAGS = -pedantic $(warn) $(dbg) $(opt) $(def) $(inc) -fno-strict-aliasing -MMD
+CFLAGS = $(warn) $(dbg) $(opt) $(def) $(inc) -MMD
 LDFLAGS = -Wl,-Map=link.map
 
 $(bin): $(obj)

diff --git a/src/dos/gfx.c b/src/dos/gfx.c
index 474a2e1..f7276af 100644 (file)
--- a/src/dos/gfx.c
+++ b/src/dos/gfx.c
@@ -94,13 +94,9 @@ int init_video(void)
                }
                if(minf.attr & VBE_ATTR_LFB) {
                        vmptr->fb_addr = minf.fb_addr;
-               } else {
-                       vmptr->bank_size = (uint32_t)minf.bank_size * 1024;
-                       if(!vmptr->bank_size) {
-                               vmptr->bank_size = 65536;
-                       }
                }
                vmptr->max_pages = minf.num_img_pages;
+               vmptr->win_gran = minf.win_gran;
 
                printf("%04x: ", vbe.modes[i]);
                vbe_print_mode_info(stdout, &minf);
@@ -114,6 +110,7 @@ int init_video(void)
 void cleanup_video(void)
 {
        free(vmodes);
+       vmodes = 0;
 }
 
 struct video_mode *video_modes(void)
@@ -198,7 +195,7 @@ void *set_video_mode(int idx, int nbuf)
        curmode = vm;
        if(nbuf < 1) nbuf = 1;
        if(nbuf > 2) nbuf = 2;
-       pgcount = nbuf > vm->max_pages ? vm->max_pages : nbuf;
+       pgcount = nbuf > vm->max_pages + 1 ? vm->max_pages + 1 : nbuf;
        pgsize = vm->ysz * vm->pitch;
        fbsize = pgcount * pgsize;
 
@@ -237,6 +234,20 @@ void *set_video_mode(int idx, int nbuf)
                vpgaddr[1] = 0;
 
                blit_frame = blit_frame_banked;
+
+               /* calculate window granularity shift */
+               vm->win_gran_shift = 0;
+               vm->win_64k_step = 1;
+               if(vm->win_gran > 0 && vm->win_gran < 64) {
+                       int gran = vm->win_gran;
+                       while(gran < 64) {
+                               vm->win_gran_shift++;
+                               gran <<= 1;
+                       }
+                       vm->win_64k_step = 1 << vm->win_gran_shift;
+               }
+
+               printf("  granularity: %dk (step: %d)\n", vm->win_gran, vm->win_64k_step);
        }
 
        /* allocate main memory framebuffer */
@@ -287,7 +298,7 @@ static void blit_frame_lfb(void *pixels, int vsync)
 
 static void blit_frame_banked(void *pixels, int vsync)
 {
-       int sz, offs;
+       int offs;
        unsigned int pending;
        unsigned char *pptr = pixels;
 
@@ -297,14 +308,13 @@ static void blit_frame_banked(void *pixels, int vsync)
        offs = 0;
        pending = pgsize;
        while(pending > 0) {
-               sz = pending > curmode->bank_size ? curmode->bank_size : pending;
-               //memcpy64((void*)0xa0000, pptr, sz >> 3);
-               memcpy((void*)0xa0000, pptr, sz);
-               pptr += sz;
-               pending -= sz;
-               vbe_setwin(0, ++offs);
+               //memcpy64((void*)0xa0000, pptr, 16384);
+               memcpy((void*)0xa0000, pptr, 65536);
+               pptr += 65536;
+               pending -= 65536;
+               offs += curmode->win_64k_step;
+               vbe_setwin(0, offs);
        }
-
        vbe_setwin(0, 0);
 }
 

diff --git a/src/dos/gfx.h b/src/dos/gfx.h
index 2f33db4..77322f9 100644 (file)
--- a/src/dos/gfx.h
+++ b/src/dos/gfx.h
@@ -11,7 +11,7 @@ struct video_mode {
        uint32_t rmask, gmask, bmask;
        uint32_t fb_addr;
        short max_pages;
-       uint32_t bank_size;
+       int win_gran, win_gran_shift, win_64k_step;
 };
 
 #ifdef __cplusplus

diff --git a/src/dos/vbe.c b/src/dos/vbe.c
index 05a5883..cb37ca1 100644 (file)
--- a/src/dos/vbe.c
+++ b/src/dos/vbe.c
@@ -207,7 +207,7 @@ void vbe_print_mode_info(FILE *fp, struct vbe_mode_info *minf)
        if(minf->attr & VBE_ATTR_LFB) {
                fprintf(fp, " lfb@%lx", (unsigned long)minf->fb_addr);
        } else {
-               fprintf(fp, " %xkb/bank", (unsigned int)minf->bank_size);
+               fprintf(fp, " (%dk gran)", (int)minf->win_gran);
        }
 
        fprintf(fp, " [");

diff --git a/tools/pack.bat b/tools/pack.bat
index 7fddfeb..ac36200 100644 (file)
--- a/tools/pack.bat
+++ b/tools/pack.bat
@@ -4,10 +4,11 @@ mkdir c:\tmp\rbench\src
 mkdir c:\tmp\rbench\src\dos
 mkdir c:\tmp\rbench\tools
 
-copy Makefile.dos c:\tmp\rbench
+copy Makefile.dj c:\tmp\rbench
 copy tools\lutgen.c c:\tmp\rbench\tools
+copy tools\pack.bat c:\tmp\rbench\tools
 copy src\*.c c:\tmp\rbench\src
+copy src\*.s c:\tmp\rbench\src
 copy src\*.h c:\tmp\rbench\src
 copy src\dos\*.c c:\tmp\rbench\src\dos
 copy src\dos\*.h c:\tmp\rbench\src\dos
-copy pack.bat c:\tmp\rbench