documentation and branding update

CONFIG.md

@@ -84,7 +84,7 @@ It enables some speed/size code optimizations and allows C65 memory mapping to w
 
 ### `CONFIG_CPU_M65_45GS02`
 
-Choose if you have a Mega65 FPGA board. It enables some speed/size code optimizations and allows Mega65 memory mapping to work.
+Choose if you have a MEGA65 FPGA board. It enables some speed/size code optimizations and allows MEGA65 memory mapping to work.
 
 ### `CONFIG_CPU_WDC_65816`
 
@@ -111,7 +111,7 @@ These models additionaly use RAM under BASIC, and the 50K additionally takes ove
 
 Uses RAM under BASIC, I/O and KERNAL, takes over `$C000`-`$CFFF` area requires special helper routines installed in `$2A7`-`$2FF` area (normally unused and free for the user). Gives the most free memory for BASIC programs, but it's the slowest (for example, forces disabling optimized LOAD loop for JiffyDOS) and the least compatible model.
 
-It is currently not compatible with Mega65 extended ROMs.
+It is currently not compatible with MEGA65 extended ROMs.
 
 Comparing to standard memory model, it needs about 180 bytes in BASIC segment and 80 bytes in KERNAL segment - at the moment of doing the test, these values are expected to change often.
 
@@ -147,7 +147,7 @@ Causes screen blanking during JiffyDOS file loading to increase performance.
 
 ## Tape support
 
-Note: for Mega65 most of the tape support code is placed in it's extended ROM; very little of the (tiny) KERNAL segment is used.
+Note: for MEGA65 most of the tape support code is placed in it's extended ROM; very little of the (tiny) KERNAL segment is used.
 
 ### `CONFIG_TAPE_NORMAL`
 
@@ -287,7 +287,7 @@ Feature needs several bytes in BASIC segment. If unsure - enable.
 
 If enabled, embeds a tape head align tool into the ROM, it can be started with `←H`. Requires `CONFIG_TAPE_WEDGE`.
 
-Feature needs about 800 bytes in KERNAL segment. Only recomended for machines with extended ROM, like Mega65.
+Feature needs about 800 bytes in KERNAL segment. Only recomended for machines with extended ROM, like MEGA65.
 
 ### `CONFIG_BCD_SAFE_INTERRUPTS`
 

CREDITS.md

@@ -3,7 +3,7 @@
 
 ## for source code/assets we reused
 
-* Retrofan - for his Mega65 banner artwork and PXLfont
+* Retrofan - for his MEGA65 banner artwork and PXLfont
 * TWW/CTR - for his keyboard handling code
 * Graham - for his PAL/NTSC detection code and compact 8x8 multiplication routine
 * enthusi/Onslaught - for his example Turbo Tape 64 compatible loader
@@ -26,10 +26,10 @@
 
 ## other
 
-* Gábor Lénárt - for [his work](https://github.com/lgblgblgb/xemu) on XEMU Mega65 emulator
+* Gábor Lénárt - for [his work](https://github.com/lgblgblgb/xemu) on XEMU MEGA65 emulator
-* Hernán Di Pietro - for [his work](https://github.com/hernandp/xemu) on XEMU Mega65 emulator
+* Hernán Di Pietro - for [his work](https://github.com/hernandp/xemu) on XEMU MEGA65 emulator
 * Mads Nielsen - for the [Kick Assembler](http://www.theweb.dk/KickAssembler/Main.html#frontpage)
-* Simon Jameson - for his Kick Assembler [pseudocommands](https://github.com/smnjameson/M65_KickAsm_PseudoCommands) for Mega65 CPU support
+* Simon Jameson - for his Kick Assembler [pseudocommands](https://github.com/smnjameson/M65_KickAsm_PseudoCommands) for MEGA65 CPU support
 
 <br />
 

README.md

@@ -22,7 +22,7 @@ which typically requires the inclusion of firmware, i.e, "ROMs", while respectin
 the owners of the copyrights in the ROMs.
 
 Therefore the goal of this project is to create a fully open-source and unencumbered set of ROMs for various systems.
-The initial focus is the C64 and C65 computers, because of the desire to be able to include open ROMs with the MEGA65
+The initial focus is the C64 and C65 computers, because of the desire to be able to include Open ROMs with the MEGA65
 retro computer.
 
 In short, this project exists precisely because we respect, and want to help others to respect the intellectual property

STATUS.md

@@ -22,7 +22,7 @@ Here are the features of the Open ROMs not found in the original ROMs from the 8
 * normal tape load error log is limited by free stack space only (no artificial limitation like in original ROMs)
 * tape format autodetection; normal vs turbo is mostly transparent to user
 * improved support for tape adapters (for using regular casette players and other audio devices instead of Datasette) and emulators
-* built-in tape head align tool (only feasible to use on machines with extended memory, like Mega65)
+* built-in tape head align tool (only feasible to use on machines with extended memory, like MEGA65)
 
 * uses RAM under ROM and I/O: 51199 bytes free (up to `$CFFF`) by default, but 61438 is also possible
 * cold/warm start silences multiple SID chips
@@ -58,7 +58,7 @@ The following ROM features are currently missing:
 | :----------------: | :------: | :------------------------------------------------: |
 | C64                | DONE     |                                                    |
 | C128               | DONE     |                                                    |
-| Mega65             | PARTIAL  | code mostly complete, but not tested yet           |
+| MEGA65             | PARTIAL  | code mostly complete, but not tested yet           |
 
 <br />
 
@@ -70,7 +70,7 @@ The following ROM features are currently missing:
 | :----------------: | :------: | :------------------------------------------------: |
 | VIC-II             | DONE     |                                                    |
 | 80 columns, VDC    | NOT DONE |                                                    |
-| 80 columns, Mega65 | PARTIAL  | no windowing mode and C65/M65 extra keys support   |
+| 80 columns, MEGA65 | PARTIAL  | no windowing mode and C65/M65 extra keys support   |
 
 <br />
 
@@ -103,7 +103,7 @@ The following ROM features are currently missing:
 | JiffyDOS           | PARTIAL  | LOAD needs improvement for better performance      |
 | DolphinDOS         | DONE     |                                                    |
 | CIA burst mod      | NOT DONE |                                                    |
-| Mega65 burst       | NOT DONE |                                                    |
+| MEGA65 burst       | NOT DONE |                                                    |
 
 <br />
 

doc/Development.md

@@ -18,16 +18,16 @@ Most important: always test your software on the original ROMs too. If your code
 
 Please, do not use any internal/unofficial Open ROMs API. They WILL change in an incompatible way, you may believe me. Using unofficial API of the original ROMs is OK if the routine is marked as supported in the [implementation status](../STATUS.md) document.
 
-### Compatibility with Open ROMs for Mega65
+### Compatibility with Open ROMs for MEGA65
 
-The Mega65 Open ROMs build aims to provide a C64-compatible memory map in range `$00000-$0FFFF`. For `$10000` and above, everything is still subject to change.
+The MEGA65 Open ROMs build aims to provide a C64-compatible memory map in range `$00000-$0FFFF`. For `$10000` and above, everything is still subject to change.
 
-Please note, that certain ROM routines are moved to additional Mega65 ROM area (2x8KB is not enough to implement full ROM functionality and additional features) - original locations contain just short compatibility code which remaps memory, calls the real routine, and restores default mapping (that means all blocks unmapped). This shouldn't be a problem for original C64 software, but can make a difference for Mega65-aware code; thus, please follow these simple rules:
+Please note, that certain ROM routines are moved to additional MEGA65 ROM area (2x8KB is not enough to implement full ROM functionality and additional features) - original locations contain just short compatibility code which remaps memory, calls the real routine, and restores default mapping (that means all blocks unmapped). This shouldn't be a problem for original C64 software, but can make a difference for MEGA65-aware code; thus, please follow these simple rules:
 
 - do not call ROM routines with .B set to anything other than 0 (and .B set to 0x40 or above is a receipe for disaster!)
 - be aware that ROM routines may restore the default memory mapping by means of MAP/EOM
 
-Open ROMs interrupt handlers do not touch the ROM mapping, range `0x4000-0xBFFF` can be freely mapped without disabling IRQ or NMI. The .Z register is mostly safe to use too - some routines might use it, but they will alwayys restore it's previous state. Please be aware, that for maximum compatibility our IRQ/NMI handlers DO NOT store/restore .Z register.
+Open ROMs interrupt handlers do not touch the ROM mapping, range `0x4000-0xBFFF` can be freely mapped without disabling IRQ or NMI. The .Z register is mostly safe to use too - some routines might use it, but they will always restore it's previous state. Please be aware, that for maximum compatibility our IRQ/NMI handlers DO NOT store/restore .Z register.
 
 ### API extensions
 
@@ -63,10 +63,11 @@ Bits 3 and 4 are extension to the original variable, compatible with the C128 RO
 
 Before modifying NMI vector, set it's high byte to 0. The ROM routine considers such address invalid and won't try to call the custom code, thus preventing a crash if interrupt happens in the worst possible moment.
 
-#### Mega65 native mode
+#### MEGA65 native mode
 
-Mega65 build starts in legacy mode, which is intended to be reasonably compatible with the C64 ROMs. However, a native Mega65 mode is planned too, to make it easier to utilise extra features of this machine. Soo far the following has been done:
+MEGA65 native mode imlementation has started. Important changes so far:
 
+- Uses VIC-IV features to implement 80-column screen mode; the $0400-$07FF area is utilized by ROM to provide additional features.
 - Slightly different chargen. On C64 machines pressing C= + G or C= + M key combinations produces the same visual result as C= + H or C= + N, respectively - despite keycap printing suggests they should produce tinner bars. This was intentional change in the C64 ROMs (compared to VIC-20), to prevent colour problems on 80s era TVs. Screen font used in the legacy mode duplicates this change, but the font intended for native mode has this change reverted back. Additionally, the π sign is available for lower/upper case set too.
 
 ## Tinkering with Open ROMs
@@ -86,7 +87,7 @@ List of the most important make targets:
 | `test`              | builds the 'custom' configuration, launches it using VICE emulator              |
 | `test_generic`      | builds the default ROMs, for generic C64/C128, launches using VICE              | 
 | `test_generic_x128` | as above, but launches C128 emulator instead                                    |
-| `test_mega65`       | builds the Mega65 ROM, launches it using XEMU emulator                          |
+| `test_mega65`       | builds the MEGA65 ROM, launches it using XEMU emulator                          |
 | `test_ultimate64`   | builds the Ultimate 64 configuration, launches it using VICE emulator           |
 | `test_hybrid`       | builds a hybrid ROM (Open ROMs Kernal + original BASIC), launches it using VICE |
 | `test_testing`      | builds a rather odd testing configuration, launches it using VICE emulator      |
@@ -158,7 +159,7 @@ This can be found in a private (internal) vector table of `KERNAL_1` segment of
 // #LAYOUT# *   *        #IGNORE
 ```
 
-This is used for memory mapping helper routines, which are only needed for Mega65 build. They will be placed in `KERNAL_0` segment in such case. And the last example:
+This is used for memory mapping helper routines, which are only needed for MEGA65 build. They will be placed in `KERNAL_0` segment in such case. And the last example:
 
 ```
 // #LAYOUT# STD *        #TAKE
@@ -167,7 +168,7 @@ This is used for memory mapping helper routines, which are only needed for Mega6
 // #LAYOUT# *   *        #IGNORE
 ```
 
-This is for the routine, that on Mega65 goes to `KERNAL_1` segment, but can still be transparently called using fixed location in `KERNAL_0` segment. The code might, for example, look this way:
+This is for the routine, that on MEGA65 goes to `KERNAL_1` segment, but can still be transparently called using fixed location in `KERNAL_0` segment. The code might, for example, look this way:
 
 ```
 ROUTINE_NAME:
@@ -187,6 +188,10 @@ ROUTINE_NAME:
 
 Last, but not least - the `#TAKE-HIGH` is intended to be used for BASIC routines, which should still be available after the main BASIC ROM is banked out.
 
+### MEGA65 computer-based DOS
+
+TODO
+
 ### CPU-specific optimizations
 
 TODO

doc/Extended-BASIC-TODO.md

@@ -1,7 +1,7 @@
 
 # Planned BASIC features, when V2 compatibility is reached
 
-Ideas for the future, most of them suitable for Mega65 or other power machines only
+Ideas for the future, most of them suitable for MEGA65 or other power machines only
 
 * sound support
 * 2D graphics support
@@ -18,16 +18,15 @@ Ideas for the future, most of them suitable for Mega65 or other power machines o
 * `CGOTO` and `CGOSUB` - computatiuonal versions, should accept expressions
 * `LABEL`, `LGOTO` and `LGOSUB` - jump to label
 * some kind of subroutines with local variable namespace, possibly loaded from disc (like in Warsaw Basic 3.2)
-* for Mega65 mode, move variables to a separate memory area, consider extending variable name length
+* for MEGA65 mode, move variables to a separate memory area, consider extending variable name length
 * `←V` (verify from tape) - if Kernal is extended to offer this feature
 * modulo function or opeerator
 * `DPEEK`, `DPOKE`, `QPEEK`, `QPOKE` - 2/4 byte `PEEK` and `POKE` variants
-* all the functions/commands accepting memory addresses should be able to access the whole Mega65 memory
+* all the functions/commands accepting memory addresses should be able to access the whole MEGA65 memory
 * ability to limit memory used by basic to standard 38K or to 46K (memory model switch)
 * `XOR` operator
 * `AUTO` - line auto numbering
 * `RENUMBER` for chanign the line numbers
-* `IF ... THEN`, `BEGIN ... BEND`; `ELSE` not planned, as it would have slown down the execution 
 * consider `BOOT` command
 * possibly some commands for creating menus and dialog boxes
 * more configurable `INPUT`
@@ -38,10 +37,8 @@ Ideas for the future, most of them suitable for Mega65 or other power machines o
 * `DELETE` command to delete several BASIC lines, as in BASIC V10
 * `FOR` loop should accept integer variable as index
 * `FETCH`, `STASH`, `SWAP` - REU support
-* `DMA` command for Mega65
+* `DMA` command for MEGA65
 * geoRAM support
-* `GO 64` / `GO 65` should enable/disable C64 compatibility mode on Mega65
-* `NSYS` for Mega65 - native `SYS` for Mega65, should not switch to C64 compatibilty mode
 * `DO ... LOOP`, `DO ... UNTIL`, `DO ... WHILE`, `EXIT`
 * `SEEK#` to read-and-forget n bytes
 * `RECORD#` command from BASIC V10
@@ -63,3 +60,8 @@ Ideas for the future, most of them suitable for Mega65 or other power machines o
 * function to generate string of n duplicated characters
 * function to retrieve fractional part of a number
 * command to fill text screen area with a character, inverse screen area, scroll, or change fg/bg color of screen area
+
+# Features not planned
+
+* `ELSE` - it would have slown down the execution, can be easily substituted
+* `BEGIN ... BEND` - similarly, using these would hurt the performance

doc/Extended-BASIC.md

@@ -1,7 +1,7 @@
 
 # Extended BASIC
 
-NOTE: Command syntax, behaviour details, and tokens are still subject to change! Currently the availability of some depends on the build configuration, in the future most (if not all) extended commands will be available only on machines with extended ROM, like the Mega65 or Ultimate 64.
+NOTE: Command syntax, behaviour details, and tokens are still subject to change! Currently the availability of some depends on the build configuration, in the future most (if not all) extended commands will be available only on machines with extended ROM, like the MEGA65 or Ultimate 64.
 
 ## DOS Wedge
 
@@ -35,7 +35,7 @@ Loads the file from tape. Depending on the configuration, it tries to load the f
 
 Like above, but merges a BASIC program to the one already stored in memory.
 
-### `←H` (Mega65)
+### `←H` (MEGA65)
 
 Launches a built-in tape head alignment tool. Destroys program in memory. Press `RUN/STOP` to terminate the tool.
 
@@ -59,7 +59,7 @@ Saves the binary data from the given memory area. NOTE: for now syntax differs f
 
 ## Additional BASIC commands - misc
 
-### `COLD` (Mega65)
+### `COLD` (MEGA65)
 
 Resets the machine. In direct mode asks for confirmation first.
 
@@ -75,7 +75,7 @@ Tries to switch the machine back to 1 MHz operation mode.
 
 Tries to restore program destroyed by the `NEW` command or a reset.
 
-### `MEM` (Mega65)
+### `MEM` (MEGA65)
 
 Displays BASIC memory usage information:
 * `TEXT` - size of BASIC program text, always at least 2 bytes are used
@@ -84,7 +84,7 @@ Displays BASIC memory usage information:
 * `STRS` - bytes occupied by strings, also the ones belonging to arrays
 * `FREE` - unused space
 
-### `SYSINFO` (Mega65)
+### `SYSINFO` (MEGA65)
 
 Displays various system information.
 
@@ -96,10 +96,10 @@ Clears the screen content.
 
 Runs the garbage collector - disposes outdated strings.
 
-### `NSYS` (Mega65)
+### `NSYS` (MEGA65)
 
 A 'native' `SYS` - same as `SYS`, but does not switch to C64 compatibility mode.
 
-### `GO 64`, `GO 65` (Mega65)
+### `GO 64`, `GO 65` (MEGA65)
 
 Switches machine to C64 compatibility mode or to MEGA65 native mode. Performs `CLR`

src/aliases/,aliases_config.s

@@ -113,10 +113,10 @@
 // Check that memory model and ROM layout configurations is correct
 {
 #if ROM_LAYOUT_M65 && !CONFIG_CPU_M65_45GS02
-	.error "Mega65 ROM layout requires CONFIG_CPU_M65_45GS02"
+	.error "MEGA65 ROM layout requires CONFIG_CPU_M65_45GS02"
 #endif
 #if ROM_LAYOUT_M65 && !CONFIG_MB_MEGA_65
-	.error "Mega65 ROM layout requires CONFIG_MB_MEGA_65"
+	.error "MEGA65 ROM layout requires CONFIG_MB_MEGA_65"
 #endif
 
 	.var selected = 0;

src/aliases/,aliases_cpu.s

@@ -86,7 +86,7 @@
 
 
 //
-// Memory mapping for C65 and Mega65
+// Memory mapping for C65 and MEGA65
 //
 
 #if HAS_OPCODES_4510

src/aliases/,aliases_ram_lowmem_m65.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   * #IGNORE
 
 //
-// Names of ZP and low memory locations for the native Mega65 mode
+// Names of ZP and low memory locations for the native MEGA65 mode
 //
 
 

src/basic/assets/startup_banner_m65.s

@@ -10,7 +10,7 @@
 
 startup_banner:
 
-	// Fancy Mega65 banner - from Retrofan, slightly tweaked
+	// Fancy MEGA65 banner - from Retrofan, slightly tweaked
 
 
 	// remove unneeded $1F's (blue) and $9A's (light blue)
@@ -34,7 +34,7 @@ startup_banner:
 	.byte $12, $20, $20, $92, $20, $20, $12, $96, $A3, $A3, $A3, $A3, $1F, $92
 	.byte $0D, $0D, $05, $00
 
-	// Fancy Mega65 banner - from Retrofan
+	// Fancy MEGA65 banner - from Retrofan
 	//
 	// .byte $9a, $12, $20, $20, $7f, $a9, $20, $20, $1f, $20, $9a, $20, $20, $20
 	// .byte $20, $1f, $20, $9a, $a9, $20, $20, $20, $92, $a1, $1f, $12, $20, $9a, $a9, $20
@@ -52,7 +52,7 @@ startup_banner:
 	// .byte $20, $20, $1f, $20, $20, $96, $a3, $a3, $a3, $a3, $1f
 	// .byte $92, $0D, $0D, $05, $00
 
-	// Original Mega65 banner - supplied by Deft
+	// Original MEGA65 banner - supplied by Deft
 	//
 	// .byte $9A,$12,$A3,$A3,$A3,$A3,$A3,$A3,$DF,$9B,$92,$20,$05,$12,$A0,$A0
 	// .byte $DF,$9B,$92,$20,$05,$12,$A0,$A0,$DF,$9B,$92,$20,$05,$12,$A0,$A0

src/basic/basic_commands_01/cmd_fast_slow.s

@@ -5,7 +5,7 @@
 
 #if CONFIG_MB_MEGA_65
 
-	// For Mega65 Kernal routines are called directly
+	// For MEGA65 Kernal routines are called directly
 
 #elif CONFIG_MB_ULTIMATE_64
 

src/basic/board_m65/4000.mega65_vectable_basic_1.s

@@ -3,7 +3,7 @@
 // #LAYOUT# *   *       #IGNORE
 
 //
-// Definitions for communication with Mega65 segment BASIC_1 from BASIC_0
+// Definitions for communication with MEGA65 segment BASIC_1 from BASIC_0
 //
 
 

src/basic/board_m65/mega65_imports.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *       #IGNORE
 
 //
-// Definitions for calling Mega65 segments BASIC_0 and KERNAL_0 routines from BASIC_1
+// Definitions for calling MEGA65 segments BASIC_0 and KERNAL_0 routines from BASIC_1
 //
 
 #import "BASIC_0_combined.sym"

src/basic/board_m65/mega65_map_helpers.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *       #IGNORE
 
 //
-// ROM mapping routines for Mega65
+// ROM mapping routines for MEGA65
 //
 
 // Available memory maps:

src/basic/board_m65/mega65_proxies.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *       #IGNORE
 
 //
-// Proxies for calling Mega65 segment BASIC_0 and KERNAL_0 routines from BASIC_1
+// Proxies for calling MEGA65 segment BASIC_0 and KERNAL_0 routines from BASIC_1
 //
 
 

src/kernal/board_m65/4000.mega65_vectable_kernal_1.s

@@ -3,7 +3,7 @@
 // #LAYOUT# *   *        #IGNORE
 
 //
-// Definitions for communication with Mega65 segment KERNAL_1 from KERNAL_0
+// Definitions for communication with MEGA65 segment KERNAL_1 from KERNAL_0
 //
 
 

src/kernal/board_m65/mega65_imports.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *        #IGNORE
 
 //
-// Definitions for calling Mega65 segment KERNAL_0 routines from KERNAL_1
+// Definitions for calling MEGA65 segment KERNAL_0 routines from KERNAL_1
 //
 
 #import "KERNAL_0_combined.sym"

src/kernal/board_m65/mega65_map_helpers.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *        #IGNORE
 
 //
-// ROM mapping routines for Mega65
+// ROM mapping routines for MEGA65
 //
 
 // Available memory maps:

src/kernal/board_m65/mega65_proxies.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *        #IGNORE
 
 //
-// Proxies for calling Mega65 segment KERNAL_0 routines from KERNAL_1
+// Proxies for calling MEGA65 segment KERNAL_0 routines from KERNAL_1
 //
 
 

src/kernal/board_m65/mega65_redirect_api.s

@@ -2,7 +2,7 @@
 // #LAYOUT# *   *        #IGNORE
 
 //
-// ROM routine call redirect for Mega65 API routines
+// ROM routine call redirect for MEGA65 API routines
 //
 
 M65_MODESET:

src/kernal/init/fda3.ioinit.s

@@ -105,7 +105,7 @@ IOINIT:
 
 #else
 
-	// Mega65 specific handling - it contains 4 SIDs
+	// MEGA65 specific handling - it contains 4 SIDs
 
 	sta SID_SIGVOL + __SID_R1_OFFSET
 	sta SID_SIGVOL + __SID_R2_OFFSET

tools/patch_chargen.cc

@@ -1,6 +1,6 @@
 //
 // Utility to patch the character generator file to create
-// font for Mega65 native mode and possibly other uses
+// font for MEGA65 native mode and possibly other uses
 //
 
 #include "common.h"