Integrate Aznable codebase

Author: JimmyStones

.gitattributes

@@ -1,4 +1,5 @@
 # Auto detect text files and perform LF normalization
 * text=auto
 # Convert linux scripts to LF permanently
-*.sh crlf=input
+*.sh text eol=lf
+*.define text eol=lf

.gitignore

@@ -42,14 +42,24 @@ verilator/obj_dir/*
 verilator/x64/*
 verilator/roms/*
 verilator/*.hex
-src/os.asm
-src/os.bin
-src/os.lk
-src/os.lst
-src/os.map
-src/os.noi
-src/os.sym
+rtl/*.hex
 .vscode/settings.json
 verilator/imgui.ini
 verilator/imgui.ini
-docs/*
+**/.vs/*
+**/bin/*
+**/obj/*
+docs/vids/*
+verilator/audio.wav
+*.log
+**/build/*.sym
+**/build/*.rel
+**/build/*.lst
+**/build/*.map
+**/build/*.noi
+**/build/*.lk
+**/build/*.asm
+**/sound/res/*
+**/sprites/res/*
+**/tilemap/res/*
+**/music/res/*

CURRENT_PROJECT

@@ -0,0 +1 @@
+inputtest

InputTest.qsf

@@ -50,7 +50,7 @@ set_global_assignment -name PHYSICAL_SYNTHESIS_ASYNCHRONOUS_SIGNAL_PIPELINING ON
 set_global_assignment -name ALM_REGISTER_PACKING_EFFORT MEDIUM
 set_global_assignment -name SEED 1
 
-#set_global_assignment -name VERILOG_MACRO "MISTER_FB=1"
+set_global_assignment -name VERILOG_MACRO "MISTER_FB=1"
 
 #enable it only if 8bit indexed mode is used in core
 #set_global_assignment -name VERILOG_MACRO "MISTER_FB_PALETTE=1"
@@ -60,6 +60,18 @@ set_global_assignment -name SEED 1
 #do not enable DEBUG_NOHDMI in release!
 #set_global_assignment -name VERILOG_MACRO "MISTER_DEBUG_NOHDMI=1"
 
+# Aznable specific defines
+# ------------------------
+#set_global_assignment -name VERILOG_MACRO "DISABLE_CPU=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_CHARMAP=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_SPRITES=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_TILEMAP=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_MUSIC=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_SOUND=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_STARS_2=1"
+#set_global_assignment -name VERILOG_MACRO "DISABLE_STARS_3=1"
+#set_global_assignment -name VERILOG_MACRO "DEBUG_SPRITE_COLLISION=1"
+
 source sys/sys.tcl
 source sys/sys_analog.tcl
 source files.qip

InputTest.sv

@@ -2,8 +2,8 @@
 	Input Test - emu module
 
 	Author: Jim Gregory - https://github.com/JimmyStones/
-	Version: 1.0
-	Date: 2021-07-12
+	Version: 1.1
+	Date: 2021-12-22
 
 	This program is free software; you can redistribute it and/or modify it
 	under the terms of the GNU General Public License as published by the Free
@@ -29,7 +29,7 @@ module emu
 	input         RESET,
 
 	//Must be passed to hps_io module
-	inout  [45:0] HPS_BUS,
+	inout  [47:0] HPS_BUS,
 
 	//Base video clock. Usually equals to CLK_SYS.
 	output        CLK_VIDEO,
@@ -180,14 +180,14 @@ assign USER_OUT = '1;
 assign {UART_RTS, UART_TXD, UART_DTR} = 0;
 assign {SD_SCK, SD_MOSI, SD_CS} = 'Z;
 assign {SDRAM_DQ, SDRAM_A, SDRAM_BA, SDRAM_CLK, SDRAM_CKE, SDRAM_DQML, SDRAM_DQMH, SDRAM_nWE, SDRAM_nCAS, SDRAM_nRAS, SDRAM_nCS} = 'Z;
-assign {DDRAM_CLK, DDRAM_BURSTCNT, DDRAM_ADDR, DDRAM_DIN, DDRAM_BE, DDRAM_RD, DDRAM_WE} = '0;  
+assign FB_FORCE_BLANK = 0;
 assign VGA_F1 = 0;
 assign VGA_SCALER = 0;
 assign HDMI_FREEZE = 0;
-assign AUDIO_S = 0;
-assign AUDIO_L = 0;
-assign AUDIO_R = 0;
+
+assign AUDIO_S = 1;
 assign AUDIO_MIX = 0;
+
 assign LED_DISK = 0;
 assign LED_POWER = 0;
 assign BUTTONS = 0;
@@ -203,10 +203,25 @@ assign VIDEO_ARY = (!ar) ? 12'd3 : 12'd0;
 localparam CONF_STR = {
 	"InputTest;;",
 	"-;",
+	"O35,Scandoubler Fx,None,HQ2x,CRT 25%,CRT 50%,CRT 75%;",
+	"OGJ,Analog Video H-Pos,0,-1,-2,-3,-4,-5,-6,-7,8,7,6,5,4,3,2,1;",
+	"OKN,Analog Video V-Pos,0,-1,-2,-3,-4,-5,-6,-7,8,7,6,5,4,3,2,1;",
 	"O89,Aspect ratio,Original,Full Screen,[ARC1],[ARC2];",
 	"-;",
+	"O6,Rotate video,Off,On;",
+	"O7,Flip video,Off,On;",
+	"-;",	
+	"RA,Open menu;",
+	"-;",
+	"P1,Pause options;",
+	"P1OP,Pause when OSD is open,On,Off;",
+	"P1OQ,Dim video after 10s,On,Off;",
+	"-;",
 	"F0,BIN,Load BIOS;",
+	"F3,BIN,Load Sprite ROM;",
+	"F4,YM,Load Music (YM5/6);",
 	"-;",
+	"R0,Reset;",
 	"J,A,B,X,Y,L,R,Select,Start;",
 	"V,v",`BUILD_DATE
 };
@@ -287,6 +302,7 @@ hps_io #(.CONF_STR(CONF_STR)) hps_io
 	.joystick_l_analog_3(joystick_l_analog_3),
 	.joystick_l_analog_4(joystick_l_analog_4),
 	.joystick_l_analog_5(joystick_l_analog_5),
+	
 	.joystick_r_analog_0(joystick_r_analog_0),
 	.joystick_r_analog_1(joystick_r_analog_1),
 	.joystick_r_analog_2(joystick_r_analog_2),
@@ -327,55 +343,95 @@ pll pll
 
 ///////////////////   CLOCK DIVIDER   ////////////////////
 wire ce_pix;
+wire ce_2;
 jtframe_cen24 divider
 (
 	.clk(clk_sys),
-	.cen6(ce_pix)
+	.cen6(ce_pix),
+	.cen2(ce_2)
 );
 
 ///////////////////   VIDEO   ////////////////////
-wire hblank, vblank, hs, vs;
+wire hblank, vblank, hs, vs, hs_original, vs_original;
 wire [7:0] r, g, b;
+
+wire rotate_ccw = status[7];
+wire no_rotate = ~status[6];
+wire flip = status[7];
+screen_rotate screen_rotate (.*);
 arcade_video #(320,24) arcade_video
 (
 	.*,
 	.clk_video(clk_sys),
-	.RGB_in({r,g,b}),
+	.RGB_in(rgb_out),
 	.HBlank(hblank),
 	.VBlank(vblank),
 	.HSync(hs),
 	.VSync(vs),
 	.fx(status[5:3])
 );
 
+// H/V offset
+wire [3:0]  voffset = status[23:20];
+wire [3:0]  hoffset = status[19:16];
+jtframe_resync jtframe_resync
+(
+  .clk(clk_sys),
+  .pxl_cen(ce_pix),
+  .hs_in(hs_original),
+  .vs_in(vs_original),
+  .LVBL(~vblank),
+  .LHBL(~hblank),
+  .hoffset(hoffset),
+  .voffset(voffset),
+  .hs_out(hs),
+  .vs_out(vs)
+);
+
+///////////////////  PAUSE SYSTEM ///////////////////
+wire m_pause   = joystick_0[8];
+wire				pause_cpu;
+wire [23:0]		rgb_out;
+pause #(8,8,8,24) pause (
+	.*,
+	.user_button(m_pause),
+	.pause_request(),
+	.options(~status[26:25])
+);
+
 ///////////////////   MAIN CORE   ////////////////////
 wire rom_download = ioctl_download && (ioctl_index < 8'd2);
 wire reset = (RESET | status[0] | buttons[1] | rom_download);
 assign LED_USER = rom_download;
 
 system system(
-	.clk_sys(clk_sys),
-	.ce_pix(ce_pix),
+	.clk_24(clk_sys),
+	.ce_6(ce_pix),
+	.ce_2(ce_2),
 	.reset(reset),
-	.VGA_HS(hs),
-	.VGA_VS(vs),
+	.pause(pause_cpu),
+	.menu(status[10] || buttons[1]),
+	.VGA_HS(hs_original),
+	.VGA_VS(vs_original),
 	.VGA_R(r),
 	.VGA_G(g),
 	.VGA_B(b),
 	.VGA_HB(hblank),
 	.VGA_VB(vblank),
-	.dn_addr(ioctl_addr[13:0]),
+	.dn_addr(ioctl_addr[16:0]),
 	.dn_data(ioctl_dout),
 	.dn_wr(ioctl_wr),
 	.dn_index(ioctl_index),
 	.joystick({joystick_5,joystick_4,joystick_3,joystick_2,joystick_1,joystick_0}),
 	.analog_l({joystick_l_analog_5,joystick_l_analog_4,joystick_l_analog_3,joystick_l_analog_2,joystick_l_analog_1,joystick_l_analog_0}),
 	.analog_r({joystick_r_analog_5,joystick_r_analog_4,joystick_r_analog_3,joystick_r_analog_2,joystick_r_analog_1,joystick_r_analog_0}),
-	.paddle({paddle_5,paddle_4,paddle_3,paddle_2,paddle_1,paddle_0}),
+ 	.paddle({paddle_5,paddle_4,paddle_3,paddle_2,paddle_1,paddle_0}),
 	.spinner({7'b0,spinner_5,7'b0,spinner_4,7'b0,spinner_3,7'b0,spinner_2,7'b0,spinner_1,7'b0,spinner_0}),
 	.ps2_key(ps2_key),
 	.ps2_mouse({ps2_mouse_ext,7'b0,ps2_mouse}),
-	.timestamp(timestamp)
+	.timestamp(timestamp),
+	.AUDIO_L(AUDIO_L),
+	.AUDIO_R(AUDIO_R)
 );
 
 endmodule

MiSTer.pf

@@ -1,17 +1,34 @@
-# Make C code
-cd src
-make clean
+# Define current project and other variables
+PROJECT=$(cat CURRENT_PROJECT)
+CURRENTDIR=$(pwd)
+
+# Compile C code
+cd src/$PROJECT
+#make clean
 make all
-cd ..
+cd $CURRENTDIR
 
-# Verilate HDL
+# Compile verilator code
 cd verilator
-./verilate.sh
-cd ..
+./verilate.sh $PROJECT
+cd $CURRENTDIR
+
+# Build target locations
+TARGETS=( verilator rtl )
 
-# Hexify roms
-od -An -t x1 -v src/os.bin > verilator/rom.hex
-od -An -t x1 -v src/os.bin > rtl/rom.hex
-od -An -t x1 -v PETSCII.pf > verilator/font.hex
-od -An -t x1 -v PETSCII.pf > rtl/font.hex
+# Hexify rom and font and copy to build targets
+for TARGET in "${TARGETS[@]}"; do
+od -An -t x1 -v src/$PROJECT/bin/rom.bin > $TARGET/rom.hex
+od -An -t x1 -v font.pf > $TARGET/font.hex
+done
 
+# Hexify resource binarys and copy to build targets
+RESOURCES=( sprite palette music sound tilemap )
+for RESOURCE in "${RESOURCES[@]}"; do
+if [ -r "resources/$PROJECT/$RESOURCE.bin" ]; then
+echo "Updating resources/$PROJECT/$RESOURCE.bin"
+for TARGET in "${TARGETS[@]}"; do
+od -An -t x1 -v resources/$PROJECT/$RESOURCE.bin > $TARGET/$RESOURCE.hex
+done
+fi
+done

README.MD

@@ -0,0 +1,4 @@
+# Make C code
+cd src
+make clean
+cd ..

build.sh

@@ -3,7 +3,20 @@ set_global_assignment -name QIP_FILE rtl/tv80/TV80.qip
 set_global_assignment -name CDF_FILE jtag.cdf
 set_global_assignment -name QIP_FILE sys/sys.qip
 set_global_assignment -name VERILOG_FILE rtl/JTFRAME/jtframe_vtimer.v
+set_global_assignment -name VERILOG_FILE rtl/JTFRAME/jtframe_resync.v
 set_global_assignment -name VERILOG_FILE rtl/JTFRAME/jtframe_cen24.v
+set_global_assignment -name QIP_FILE rtl/jt49/jt49.qip
+set_global_assignment -name QIP_FILE rtl/jt5205/jt5205.qip
+set_global_assignment -name VERILOG_FILE rtl/charmap.v
+set_global_assignment -name VERILOG_FILE rtl/sprite_engine.v
+set_global_assignment -name VERILOG_FILE rtl/tilemap.v
+set_global_assignment -name VERILOG_FILE rtl/lfsr.v
+set_global_assignment -name VERILOG_FILE rtl/starfield.v
+set_global_assignment -name VERILOG_FILE rtl/music.v
+set_global_assignment -name VERILOG_FILE rtl/sound.v
+set_global_assignment -name VERILOG_FILE rtl/generic_timer.v
 set_global_assignment -name VERILOG_FILE rtl/system.v
 set_global_assignment -name VERILOG_FILE rtl/dpram.v
-set_global_assignment -name VERILOG_FILE rtl/spram.v
+set_global_assignment -name VERILOG_FILE rtl/dpram_w1r2.v
+set_global_assignment -name VERILOG_FILE rtl/spram.v
+set_global_assignment -name VERILOG_FILE rtl/pause.v

clean.sh

@@ -0,0 +1,2 @@
+main_theme.ym#maintheme
+game_over.ym#gameover

files.qip

@@ -0,0 +1,4 @@
+explosion#player_explode
+pickup#pickup_collect
+alarm#alarm
+newtype#newtype