nr48

.gitignore

@@ -33,6 +33,14 @@ resources/r42/*.exe
 resources/r42/*.sym
 resources/r42/*.zip
 
+resources/r48/docs
+resources/r48/x16emu
+resources/r48/*.bin
+resources/r48/*.dll
+resources/r48/*.exe
+resources/r48/*.sym
+resources/r48/*.zip
+
 bugs
 
 build/box16

README.md

@@ -22,11 +22,13 @@ Features
 		* two layers
 		* sprites
 		* VSYNC, raster, sprite IRQ
+		* FX extensions
 * Sound
     * PCM
     * PSG
     * YM2151
 * SD card: reading and writing (image file)
+* Cartridge file support
 * VIA
 	* ROM/RAM banking
 	* keyboard
@@ -38,7 +40,6 @@ Missing Features
 ----------------
 
 * VERA
-	* Does not support the "CURRENT_FIELD" bit
 	* Interlaced modes (NTSC/RGB) don't render at the full horizontal fidelity
 
 Binaries & Compiling
@@ -53,7 +54,7 @@ You can build a ROM image yourself using the [build instructions](https://github
 
 ### Linux Build
 
-Read `resources/r41/README.box16` and build or acquire the necessary files.
+Read `resources/r48/README.box16` and build or acquire the necessary files.
 
 The needed development packages are available as a distribution package with most major versions of Linux:
 - Debian: `sudo apt-get install libgtk-3-dev libsdl2-dev`
@@ -65,7 +66,7 @@ Type `make` to build the source. The output will be `box16` in the output direct
 
 ### Windows Build
 
-Read `resources/r41/README.box16` and build or acquire the necessary files.
+Read `resources/r48/README.box16` and build or acquire the necessary files.
 
 Install Microsoft Visual Studio Community 2022, make sure to include the following modules:
 - `Desktop development with C++`
@@ -372,7 +373,7 @@ Release Notes
 * Improved hypercall performance
 * -ignore_patch is now saved to ini file.
 * Saving which panels are open.
-* Keymappings now match r41 kernal.
+* Keymappings now match r48 kernal.
 * Optimized VIA timer implementation.
 * Moved imgui.ini location to match box16.ini
 * Added -nohypercalls to disable all hypercalls.

RELEASES.md

@@ -1,5 +1,50 @@
 Release Notes
 -------------
+## Non-Release 48.XX ("Mercury")
+* (Yes, I skipped nr42 through nr47. I've been away.)
+* VERA
+	* Set ISR bits upon VSYNC or LINE IRQs irrespective of what is in IEN (mooinglemur)
+	* Safety frame mask should only show by default on certain video modes.
+	* Ported VERA FX support (mooinglemur)
+* Debugging features
+	* Fixed incorrect display of CPU registers. (cosmicr)
+	* Added R/W data breakpoints.
+	* Added descriptive reason when dumping system memory file. (irmen)
+	* Added "Smart Stack", which should show improved stack context information and follow manual changes to SP.
+	* .sym files will auto-load if located in the same directory as a .prg file that loads.
+	* CPU visualization can now support resizing the visualization picture.
+	* Added debug registers to write character to console (irmen)
+	* "-sym" now supports a comma-delimited bank number.
+	* Added Boxmon console, supporting a number of Monitor console commands from the VICE emulator.
+	* Added -memorystats to show memory access counts by address.
+	* Fixes to disassembler display.
+	* Added Ca, Cl, Cm, and Co options for -trace builds. (FlightControl-User)
+* Hardware features
+	* Fix to reading PRA register on VIA chips.
+	* "-ram" now supports intervals of 8KB, not powers of 2.
+	* Cartridge support.
+	* Banked ROM support.
+	* RAM is now randomized by default, specify -zeroram to zero memory instead. (irmen)
+	* Added vector pull support on interrupts. (mooinglemur)
+* Display
+	* Palette color pickers now result in VERA-compatible colors, but the gradient still renders full 24-bit color.
+	* Moved main display to a subwindow (akumanatt)
+* Command-line options
+	* Fix to "-wav filename,auto" option
+	* Removed "-patch" option.
+	* Added "-fullscreen" option (irmen)
+* Internals
+	* Changes mouse movement processing. (akumanatt)
+	* Speed improvements in "-warp" mode.
+	* Improved pause/unpause support in wav recording.
+	* Removed GEOS option and references (Frosty-J)
+	* Changed OpenGL launcher from glew to glad, should support more OpenGL contexts on Linux.
+	* Updated ImGui to v1.89.6 (akumanatt)
+	* Support for automatically unpacking zlib-compressed files when loading a file, recompressing and overwriting the archive when saving the file.
+	* Improvements to file handling.
+	* Converted most string-parsing code from printf to fmtlib.
+	* Upgrade to C++23.
+	* Makefile now uses $(CXX) instead of g++ (irmen)
 
 ## Non-Release 41.0 ("Koutoubia Mosque")
 * Added dockable ImGui windows

build/Makefile

@@ -5,7 +5,7 @@
 #-------------------------
 
 PROJECT := box16
-RELEASE := nr41.1
+RELEASE := nr48.1
 
 REPODIR := ..
 OBJDIR := obj
@@ -130,10 +130,10 @@ release:
 
 zips: package
 	cd $(RELDIR) && tar -cvf $(RELNAME).tar $(RELNAME)/*
-	cd $(RELDIR) && 7z a -t7z $(RELNAME).7z $(RELNAME)/*
-	cd $(RELDIR) && 7z a -tzip $(RELNAME).zip $(RELNAME)/*
-	cd $(RELDIR) && 7z a -tgzip $(RELNAME).tar.gz $(RELNAME).tar
-	cd $(RELDIR) && 7z a -tbzip2 $(RELNAME).tar.bz2 $(RELNAME).tar
+	cd $(RELDIR) && 7zz a -t7z $(RELNAME).7z $(RELNAME)/*
+	cd $(RELDIR) && 7zz a -tzip $(RELNAME).zip $(RELNAME)/*
+	cd $(RELDIR) && 7zz a -tgzip $(RELNAME).tar.gz $(RELNAME).tar
+	cd $(RELDIR) && 7zz a -tbzip2 $(RELNAME).tar.bz2 $(RELNAME).tar
 
 package:
 	if [ ! -d $(ZIPSDIR) ]; then $(MKDIR) $(ZIPSDIR); fi
@@ -203,4 +203,4 @@ $(OUTDIR)/box16: $(BOX16_OBJS) $(NFD_OBJS) $(LPNG_OBJS) $(RTMIDI_OBJS) $(YMFM_OB
 	mkdir -p $(OUTDIR)
 	$(CXX) $^ -o $@ $(BOX16_LDFLAGS) $(NFD_LDFLAGS)
 	cp $(REPODIR)/resources/*.png $(OUTDIR)/
-	cp -r $(REPODIR)/resources/r41/* $(OUTDIR)/
+	cp -r $(REPODIR)/resources/r48/* $(OUTDIR)/

build/vs2022/box16.vcxproj

@@ -158,7 +158,7 @@
       <Command>xcopy $(ResourceDir)\*.png "$(OutDir)" /E /I /F /Y
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 xcopy $(VendorDir)\SDL2-2.0.10\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
@@ -202,7 +202,7 @@ xcopy $(VendorDir)\zlib-1.2.13\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
       <Command>xcopy $(ResourceDir)\*.png "$(OutDir)" /E /I /F /Y
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 xcopy $(VendorDir)\SDL2-2.0.10\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
@@ -246,7 +246,7 @@ xcopy $(VendorDir)\zlib-1.2.13\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
       <Command>xcopy $(ResourceDir)\*.png "$(OutDir)" /E /I /F /Y
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 xcopy $(VendorDir)\SDL2-2.0.10\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
@@ -283,7 +283,7 @@ xcopy $(VendorDir)\zlib-1.2.13\lib\x86\*.dll "$(OutDir)" /E /I /F /Y
 
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 
@@ -318,7 +318,7 @@ xcopy $(VendorDir)\zlib-1.2.13\lib\x64\*.dll "$(OutDir)" /E /I /F /Y
 
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 
@@ -353,7 +353,7 @@ xcopy $(VendorDir)\zlib-1.2.13\lib\x64\*.dll "$(OutDir)" /E /I /F /Y
 
 
 
-xcopy $(ResourceDir)\r41\*.* "$(OutDir)" /E /I /F /Y
+xcopy $(ResourceDir)\r48\*.* "$(OutDir)" /E /I /F /Y
 
 
 

resources/r41/README.box16 → resources/r48/README.box16

@@ -1,4 +1,4 @@
 To ensure copyrights and licenses are respected, it is up to *you*, dear reader,
 to build or otherwise acquire the following files from the official emulator:
 
-rom.bin (as of 3 May 2022, this can be acquired by downloading the r41 release at https://github.com/commanderx16/x16-emulator/releases/tag/r41)
+rom.bin (as of 3 May 2022, this can be acquired by downloading the r48 release at https://github.com/commanderx16/x16-emulator/releases/tag/r48)

src/version.h

@@ -3,6 +3,6 @@
 //               2021-2023 Stephen Horn, et al.
 // All rights reserved. License: 2-clause BSD
 
-#define VER_NUM "42.XX"
-#define VER_NAME "Akhet"
+#define VER_NUM "48.XX"
+#define VER_NAME "Mercury"
 #define VER_TITLE "box16"