Adding option to enable 50/60 Hz proper aspect ratio in OpenGL render.

Author: iss

Makefile

@@ -59,6 +59,10 @@ endif
 #CFLAGS += -DDEBUG_CPU_TRACE=1000
 #CFLAGS += -DDEBUG_CPU_TRACE=200000
 
+ifneq ($(DEBUG_VSYNC),)
+CFLAGS += -DDEBUG_VSYNC
+endif
+
 CC = gcc
 CXX = g++
 AR = ar

ReadMe.txt

@@ -152,7 +152,7 @@ Here are all the options:
                        "opengl" for OpenGL
 
   -b / --debug       = Start oricutron in the debugger
-  -r / --breakpoint  = Set a breakpoint
+  -r / --breakpoint  = Set a breakpoint (See NOTE2)
   -h / --help        = Print command line help and quit
 
   --turbotape on|off = Enable or disable turbotape
@@ -181,6 +181,10 @@ NOTE: If you are not sure what machine or drive type is required for a disk or
 tape image, just pass the filename without any options and Oricutron will
 try and autodetect for you.
 
+NOTE2: List with many breakpoints can be loaded from command line. Use default switches -r or --breakpoint,
+but instead of an address, specify filename prefixed with ':'. The file is plain text file, which contains
+desired breakpoint-addresses - one per line using the same syntax as in the monitor. Breakpoints can be set
+with absolute addresses or with symbols (loaded with command line switches -s or --symbols).
 
 Examples:
 
@@ -191,7 +195,7 @@ oricutron -m1 -tBUILD/foo.tap -sBUILD/symbols -b
 oricutron --drive microdisc --disk demos/barbitoric.dsk --fullscreen
 oricutron -ddemos/barbitoric.dsk -f
 oricutron --turbotape off tapes/hobbit.tap
-
+oricutron -s myproject.sym -r :myprojectbp.txt
 
 
 Keys
@@ -277,7 +281,7 @@ Commands:
   bcm <bp id>           - Clear mem breakpoint
   bl                    - List breakpoints
   blm                   - List mem breakpoints
-  bs <addr>             - Set breakpoint
+  bs <addr> [zc]        - Set breakpoint
   bsm <addr> [rwc]      - Set mem breakpoint
   bz                    - Zap breakpoints
   bzm                   - Zap mem breakpoints
@@ -309,6 +313,16 @@ There are two types of breakpoints. "Normal" breakpoints trigger when the CPU
 is about to execute an instruction at the breakpoint address. "Memory" breakpoints
 trigger when the breakpoint address is accessed or modified.
 
+Normal breakpoints can use 'z' and/or 'c' modifiers.
+bs $0c00           <-- Break when the CPU is about to execute code at $0c00
+bs $0c00 z         <-- Break when the CPU is about to execute code at $0c00
+                       and set cycles counter to 0
+bs $0c00 zc        <-- Set cycles counter to 0 and continues
+bs $0c00 c         <-- Continues execution (i.e. disabled breakpoint)
+
+Main purpose of this modifiers is to make cycle counting easier.
+If symbols are loaded, they can be used instead of absolute addresses.
+
 There are three ways a memory breakpoint can be triggered; when the CPU is about
 to read the address (r), and the CPU is about to write the address (w), or after the
 value at the address changes for any reason (c).

gui.c

@@ -138,14 +138,14 @@ unsigned char sgpal[] = { 0x00, 0x00, 0x00,     // 0 = black
                           0xff, 0x66, 0x00,     // 12 = Atmos sel
                           0xff, 0x33, 0x33,     // 13 = Telestrat sel
                           0x99, 0x99, 0x66,     // 14 = Pravetz bc
-                          0xcc, 0xcc, 0x99      // 15 = Pravetz sel 
+                          0xcc, 0xcc, 0x99      // 15 = Pravetz sel
 };
 
 // Colors for the menu, see sgpal for color index
 // MACH_ORIC1 = 0, MACH_ORIC1_16K, MACH_ATMOS, MACH_TELESTRAT, MACH_PRAVETZ
 
 // Name                        = {     OR      TE  PR  Or
-//                                 OR  IC  AT  LE  AV  ig  
+//                                 OR  IC  AT  LE  AV  ig
 //                                 IC  -1  MO  ST  ET  in  a$
 //                                 -1, 16, S , RA, Z , al, c  };
 static char g_foregroundc[]    = {  0,  0,  1,  1,  0,  2,  1 };
@@ -194,6 +194,7 @@ void togglesymbolsauto( struct machine *oric, struct osdmenuitem *mitem, int dum
 void togglecasesyms( struct machine *oric, struct osdmenuitem *mitem, int dummy );
 void togglevsynchack( struct machine *oric, struct osdmenuitem *mitem, int dummy );
 void swap_render_mode( struct machine *oric, struct osdmenuitem *mitem, int newrendermode );
+void togglearatio( struct machine *oric, struct osdmenuitem *mitem, int dummy );
 void togglehstretch( struct machine *oric, struct osdmenuitem *mitem, int dummy );
 void togglepalghost( struct machine *oric, struct osdmenuitem *mitem, int dummy );
 void togglescanlines( struct machine *oric, struct osdmenuitem *mitem, int dummy );
@@ -306,7 +307,7 @@ struct osdmenuitem dbopitems[] = { { " Autoload symbols file", NULL,   0,
 struct osdmenuitem vdopitems[] = { { " OpenGL rendering",      "O",    'o',      swap_render_mode, RENDERMODE_GL, 0 },
                                    { " Software rendering",    "S",    's',      swap_render_mode, RENDERMODE_SW, 0 },
                                    { OSDMENUBAR,               NULL,   0,        NULL,            0, 0 },
-                                   { " Fullscreen",         "[F8]",    SDLK_F8,  togglefullscreen, 0, 0 },
+                                   { " Fullscreen",            "[F8]", SDLK_F8,  togglefullscreen, 0, 0 },
                                    { " Scanlines",             "C",    'c',      togglescanlines, 0, 0 },
                                    { OSDMENUBAR,               NULL,   0,        NULL,            0, 0 },
                                    { "Back",                   "\x17", SDLK_BACKSPACE,gotomenu,   0, 0 },
@@ -323,6 +324,7 @@ struct osdmenuitem glopitems[] = { { " OpenGL rendering",      "O",    'o',
                                    { " Software rendering",    "S",    's',      swap_render_mode, RENDERMODE_SW, 0 },
                                    { OSDMENUBAR,               NULL,   0,        NULL,            0, 0 },
                                    { " Fullscreen",            "F",    'f',      togglefullscreen, 0, 0 },
+                                   { " 50Hz/60Hz aspect ratio", "R",   'r',      togglearatio,    0, 0 },
                                    { " Horizontal stretch",    "H",    'h',      togglehstretch,  0, 0 },
                                    { " Scanlines",             "C",    'c',      togglescanlines, 0, 0 },
                                    { " PAL ghosting",          "P",    'p',      togglepalghost,  0, 0 },
@@ -607,7 +609,13 @@ void render( struct machine *oric )
           perc = 200000/(frametimeave?frametimeave:1);
         else
           perc = 166667/(frametimeave?frametimeave:1);
+
+#ifdef DEBUG_VSYNC
+        sprintf( oric->statusstr, "%4d.%02d%% - %4dFPS  VSYNC:%3d", perc/100, perc%100, fps/100, oric->vid_offset );
+#else
         sprintf( oric->statusstr, "%4d.%02d%% - %4dFPS", perc/100, perc%100, fps/100 );
+#endif
+
         oric->newstatusstr = SDL_TRUE;
       }
       if( oric->popuptime > 0 )
@@ -1563,6 +1571,20 @@ void togglefullscreen( struct machine *oric, struct osdmenuitem *mitem, int dumm
   find_item_by_function(glopitems, togglefullscreen)->name = " Fullscreen";
 }
 
+// Toggle 50Hz/60Hz aspect ratio
+void togglearatio( struct machine *oric, struct osdmenuitem *mitem, int dummy )
+{
+  if( oric->aratio )
+  {
+    oric->aratio = SDL_FALSE;
+    mitem->name = " 50Hz/60Hz aspect ratio";
+    return;
+  }
+
+  oric->aratio = SDL_TRUE;
+  mitem->name = "\x0e""50Hz/60Hz aspect ratio";
+}
+
 // Toggle hstretch on/off
 void togglehstretch( struct machine *oric, struct osdmenuitem *mitem, int dummy )
 {
@@ -2245,6 +2267,11 @@ void setmenutoggles( struct machine *oric )
     find_item_by_function(glopitems, togglefullscreen)->name = " Fullscreen";
   }
 
+  if( oric->aratio )
+    find_item_by_function(glopitems, togglearatio)->name = "\x0e""50Hz/60Hz aspect ratio";
+  else
+    find_item_by_function(glopitems, togglearatio)->name = " 50Hz/60Hz aspect ratio";
+
   if( oric->hstretch )
     find_item_by_function(glopitems, togglehstretch)->name = "\x0e""Horizontal stretch";
   else

keyboard.c

@@ -23,7 +23,7 @@
 #include <stdlib.h>
 #endif
 
-#include <string.h> 
+#include <string.h>
 
 #include "system.h"
 #include "6502.h"

machine.c

@@ -1007,8 +1007,16 @@ void move_lightpen( struct machine *oric, int x, int y )
 
   if ((oric->rendermode == RENDERMODE_SW) || (!oric->hstretch))
   {
-    x = (x-80)/2;
-    y = (y-14)/2;
+    if(oric->rendermode == RENDERMODE_GL && oric->aratio && oric->vid_freq)
+    {
+      x = (x-112)/2;
+      y = (y-48)/2;
+    }
+    else
+    {
+      x = (x-80)/2;
+      y = (y-14)/2;
+    }
   }
   else
   {

machine.h

@@ -111,6 +111,7 @@ struct machine
   int vid_end;             // Stop drawing video
   int vid_maxrast;         // Number of raster lines
   int vid_raster;          // Current rasterline
+  int vid_offset;          // Current T1 counter position
 
   int vid_fg_col;
   int vid_bg_col;
@@ -201,7 +202,7 @@ struct machine
 
   Sint32 keymap;
 
-  SDL_bool hstretch, scanlines, palghost;
+  SDL_bool aratio, hstretch, scanlines, palghost;
   Sint32 sw_depth; // Bit depth of the emulator video mode
 
   int rendermode;

main.c

@@ -395,6 +395,7 @@ static void load_config( struct start_opts *sto, struct machine *oric )
     if( read_config_bool(   &sto->lctmp[i], "fullscreen",   &fullscreen ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "hwsurface",    &hwsurface ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "scanlines",    &oric->scanlines ) ) continue;
+    if( read_config_bool(   &sto->lctmp[i], "aratio",       &oric->aratio ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "hstretch",     &oric->hstretch ) ) continue;
     if( read_config_bool(   &sto->lctmp[i], "palghosting",  &oric->palghost ) ) continue;
     if( read_config_string( &sto->lctmp[i], "diskimage",    sto->start_disk, 1024 ) ) continue;
@@ -1136,7 +1137,7 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
         error_printf( "Invalid breakpoint file" );
         free( sto );
         return SDL_FALSE;
-      }        
+      }
       while( !feof( f ) )
       {
         char* p;
@@ -1161,7 +1162,7 @@ SDL_bool init( struct machine *oric, int argc, char *argv[] )
         free( sto );
         return SDL_FALSE;
       }
-      
+
       oric->cpu.breakpoints[0] = addr;
       oric->cpu.anybp = SDL_TRUE;
     }

oricutron.cfg

@@ -94,6 +94,9 @@ rendermode = soft
 ; Show scanlines? (yes/no)
 scanlines = no
 
+; Maintain correct aspec ratio in 50Hz/60Hz modes
+aratio = yes
+
 ; Horizontal stretch? (yes/no)  <-- opengl only
 hstretch = yes