commit 295f6b926ae240a8400cf97b12a886ce13a9bf24 Author: Astoria Date: Sun Apr 7 18:14:27 2024 -0500 Initial Commit. diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..5848682 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "J65el02"] + path = J65el02 + url = git@git.broken-moon.net:astoriaFloyd/J65el02.git diff --git a/J65el02 b/J65el02 new file mode 160000 index 0000000..c6de658 --- /dev/null +++ b/J65el02 @@ -0,0 +1 @@ +Subproject commit c6de658396d537fd0c1fc0046d5222c2dc44de3d diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..923a304 --- /dev/null +++ b/build.gradle @@ -0,0 +1,21 @@ +plugins { + id 'java' +} + +group = 'net.brokenmoon' +version = '1.0-SNAPSHOT' + +repositories { + mavenCentral() +} + +dependencies { + testImplementation platform('org.junit:junit-bom:5.9.1') + testImplementation 'org.junit.jupiter:junit-jupiter' + + implementation project(":J65el02") +} + +test { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..249e583 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e32108d --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Sun Apr 07 16:16:55 CDT 2024 +distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..1b6c787 --- /dev/null +++ b/gradlew @@ -0,0 +1,234 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..ac1b06f --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/readme.md b/readme.md new file mode 100644 index 0000000..ed98457 --- /dev/null +++ b/readme.md @@ -0,0 +1,14 @@ +# J65el02 Machine +A java app to test the J65el02 implementation of the 65el02 cpu originally created by Eloraam. + +# Credits. +Eloraam - Original cpu, providing permission to Bigfoot for their emulator. - http://www.eloraam.com/ +Bigfoot - Original emulator in C, rpcboot.bin, tetris.img, slideshow.img, and redforth.img - http://bigfootinformatika.hu/65el02/ +Simon816 - Creator of J65el02, the implementation that without this machine would not be possible. - https://github.com/simon816/J65el02 +Timmie3054, Amon, Pcmaster160, CadenDonuts, and HanFox - Original source of the font which I have used in this emulator. https://bdcraft.net/community/viewtopic.php?t=354 + +# TODO: +Speed up monitor rendering +Discover intended clock speed for 65el02 +Replace font with an original font? +Actually make a minecraft mod. \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..95914ee --- /dev/null +++ b/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'J65el02Machine' + +include ':J65el02' \ No newline at end of file diff --git a/src/main/java/net/brokenmoon/BasicMonitorDriver.java b/src/main/java/net/brokenmoon/BasicMonitorDriver.java new file mode 100644 index 0000000..be58a5d --- /dev/null +++ b/src/main/java/net/brokenmoon/BasicMonitorDriver.java @@ -0,0 +1,130 @@ +package net.brokenmoon; + +import com.simon816.j65el02.Machine; +import com.simon816.j65el02.device.MonitorDriver; +import com.simon816.j65el02.device.RPMonitor; + +import javax.imageio.ImageIO; +import javax.swing.*; +import java.awt.event.KeyEvent; +import java.awt.event.KeyListener; +import java.awt.image.BufferedImage; +import java.io.IOException; +import java.util.Objects; + +import static com.simon816.j65el02.device.RPMonitor.HEIGHT; +import static com.simon816.j65el02.device.RPMonitor.WIDTH; + +public class BasicMonitorDriver implements MonitorDriver, KeyListener { + + BufferedImage display; + BufferedImage fontSheet; + final int width = 8; + final int height = 8; + int rows = 16; + int cols = 16; + BufferedImage[] sprites = new BufferedImage[rows * cols]; + ImageIcon[] characters = new ImageIcon[rows * cols]; + JLabel[][] displayArray = new JLabel[HEIGHT][WIDTH]; + Machine emu; + + int xoffset = 32; + int yoffset = 27; + public BasicMonitorDriver(Machine emu) { + this.emu = emu; + try{ + display = ImageIO.read(Objects.requireNonNull(getClass().getResourceAsStream("/display.png"))); + fontSheet = ImageIO.read(Objects.requireNonNull(getClass().getResourceAsStream("/font.png"))); + for (int i = 0; i < rows; i++) + { + for (int j = 0; j < cols; j++) + { + sprites[(i * cols) + j] = fontSheet.getSubimage( + j * width, + i * height, + width, + height + ); + } + } + for(int i = 0; i < characters.length; i++){ + characters[i] = new ImageIcon(sprites[i]); + } + } catch(IOException e){ + System.out.print("No image!"); + } + + JPanel panel = new JPanel(null); + + JFrame frame = new JFrame("Monitor"); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + + for(int y = 0; y < displayArray.length; y++){ + for(int x = 0; x < displayArray[y].length; x++){ + displayArray[y][x] = new JLabel(new ImageIcon(sprites[' '])); + displayArray[y][x].setBounds(xoffset + (x * 8), yoffset + (y * 8), 8, 8); + displayArray[y][x].setVisible(true); + panel.add(displayArray[y][x]); + } + } + + JLabel label = new JLabel(new ImageIcon(display.getScaledInstance(350 * 2,230 * 2,0))); + label.setBounds(0, 0, 350 * 2, 230 * 2); + panel.add(label); + frame.add(panel); + + frame.addKeyListener(this); + frame.setFocusTraversalKeysEnabled(false); + + + frame.setBounds(0, 0, 710, 493); + + + frame.setVisible(true); + } + + private RPMonitor monitor; + private int cursorX; + private int cursorY; + private int cursorMode; + @Override + public void setMonitor(RPMonitor rpMonitor) { + this.monitor = rpMonitor; + } + + @Override + public void updateCursor(int cursorX, int cursorY, int cursorMode) { + this.cursorX = cursorX; + this.cursorY = cursorY; + this.cursorMode = cursorMode; + } + + @Override + public void update(byte[][] windowData) { + for(int y = 0; y < windowData.length; y++){ + for(int x = 0; x < windowData[y].length; x++){ + char chars = (char) windowData[y][x]; + displayArray[y][x].setIcon(characters[chars % 255]); + } + } + } + + @Override + public void keyTyped(KeyEvent e) { + if(e.getKeyChar() == 10){ + monitor.onKey((byte)13); + } else{ + monitor.onKey((byte)e.getKeyChar()); + } + } + + @Override + public void keyPressed(KeyEvent e) { + + } + + @Override + public void keyReleased(KeyEvent e) { + + } +} diff --git a/src/main/java/net/brokenmoon/Main.java b/src/main/java/net/brokenmoon/Main.java new file mode 100644 index 0000000..1854d3c --- /dev/null +++ b/src/main/java/net/brokenmoon/Main.java @@ -0,0 +1,71 @@ +package net.brokenmoon; + +import com.simon816.j65el02.Machine; +import com.simon816.j65el02.device.FileDiskDriver; +import com.simon816.j65el02.device.RPDrive; +import com.simon816.j65el02.device.RPMonitor; + +import java.io.IOException; +import java.net.URISyntaxException; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Date; +import java.util.Timer; +import java.util.TimerTask; + +public class Main { + static Path rpcboot; + static Path disk; + + static { + try { + rpcboot = Paths.get(Main.class.getResource("/rpcboot.bin").toURI()); + disk = Paths.get(Main.class.getResource("/slideshow.img").toURI()); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } + + static Machine emu = new Machine(rpcboot, 8192); + + static long interruptTimer = 50L; + //Adjust as needed to match original clock speed + static long frequency = 2L; + static BasicMonitorDriver monitorDriver; + + static TimerTask interruptTask = new TimerTask(){ + public void run(){ + if(emu.cpu.isWaitingForInterrupt()) + emu.interruptWait.release(); + } + }; + + static TimerTask cpuTask = new TimerTask(){ + public void run(){ + for(int i = 0; i < 50; i++) + emu.step(); + } + }; + + static Timer timer1 = new Timer(); + static Timer timer2 = new Timer(); + + public static void main(String[] args) { + + try { + FileDiskDriver tetrisDrive = new FileDiskDriver(disk, "tetrisDrive", "TETRIS", false); + monitorDriver = new BasicMonitorDriver(emu); + RPDrive diskDrive = new RPDrive(emu, tetrisDrive); + RPMonitor monitor = new RPMonitor(emu, monitorDriver); + emu.setPeripheral(emu.getDefaultDriveId(), diskDrive); + emu.setPeripheral(emu.getDefaultMonitorId(), monitor); + System.out.println("Started emu thread"); + System.out.println("Started display thread"); + timer1.schedule(interruptTask, new Date(), interruptTimer); + timer2.schedule(cpuTask, new Date(), frequency); + } catch (IOException e) { + throw new RuntimeException(e); + } + + } +} \ No newline at end of file diff --git a/src/main/resources/display.png b/src/main/resources/display.png new file mode 100644 index 0000000..2048d70 Binary files /dev/null and b/src/main/resources/display.png differ diff --git a/src/main/resources/font.png b/src/main/resources/font.png new file mode 100644 index 0000000..6627b02 Binary files /dev/null and b/src/main/resources/font.png differ diff --git a/src/main/resources/redforth.img b/src/main/resources/redforth.img new file mode 100644 index 0000000..a0536b5 Binary files /dev/null and b/src/main/resources/redforth.img differ diff --git a/src/main/resources/rpcboot.bin b/src/main/resources/rpcboot.bin new file mode 100644 index 0000000..60ce042 Binary files /dev/null and b/src/main/resources/rpcboot.bin differ diff --git a/src/main/resources/slideshow.img b/src/main/resources/slideshow.img new file mode 100644 index 0000000..d87d408 Binary files /dev/null and b/src/main/resources/slideshow.img differ diff --git a/src/main/resources/tetris.img b/src/main/resources/tetris.img new file mode 100644 index 0000000..1325d95 Binary files /dev/null and b/src/main/resources/tetris.img differ