diff --git a/README.md b/README.md index fe930a7..be77d37 100644 --- a/README.md +++ b/README.md @@ -41,25 +41,6 @@ Other inspirations were, among others, in no particular order: - the Magic-1 by Bill Buzbee - the OPC by revaldinho -## October 2025 Update -This update introduces a data cache for the Tridora-CPU. It is similar to the instruction cache -as it caches the 16 bytes coming from the DRAM memory controller. It is a write-back cache, i.e. -when a word inside the cached area is written, it updates the cache instead of invalidating it. - -This is important because there are many idioms in the stack machine assembly language where you -store a local variable and then read it again (e.g. updating a loop variable). - -Since for most programs, the user stack and parts of the heap are inside the DRAM area, the data cache -has a more noticable impact. In the benchmark program that was already used for the last update, -the data cache results in a 50% improvement for the empty loop test. This is in comparison to the version -without data cache but with the instruction cache, both running code out of DRAM. - -It is also noticable for compile times: With the data cache, compiling and assembling the -"hello,world" program takes 16 seconds instead of 20. With a little tweak of the SD-Card controller -that slightly increased the data transfer rate, the build time goes down to 15 seconds. - -Also, an audio controller was added that allows interrupt-driven sample playback via an AMP2 PMOD. - ## April 2025 Update The clock has been reduced to 77 MHz from 83 MHz. Apparently the design was at the limit and timing problems were cropping up seemingly at random. Reducing the clock speed made some @@ -81,7 +62,7 @@ on the emulator image. - the [Hackaday project](https://hackaday.io/project/198324-tridora-cpu) (mostly copy-paste from this README) - the [YouTube channel](https://www.youtube.com/@tridoracpu/videos) with some demo videos - the [emulator](https://git.insignificance.de/slederer/-/packages/generic/tridoraemu/0.0.5/files/12) (source and windows binary) -- the [FPGA bitstream](https://git.insignificance.de/slederer/-/packages/generic/tdr-bitstream/0.0.4/files/16) for the Arty-A7-35T board +- the [FPGA bitstream](https://git.insignificance.de/slederer/-/packages/generic/tdr-bitstream/0.0.2/files/14) for the Arty-A7-35T board - an [SD-card image](https://git.insignificance.de/slederer/-/packages/generic/tdr-cardimage/0.0.4/files/13) Contact the author here: tridoracpu [at] insignificance.de diff --git a/doc/irqctrl.md b/doc/irqctrl.md index bf76999..580c123 100644 --- a/doc/irqctrl.md +++ b/doc/irqctrl.md @@ -9,13 +9,12 @@ The interrupt controller uses a single register at address: $980 |_bit_ |15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|t |t |t |t |t |t |t |t |- |- |- |- |- |p2 |p1 |p0 | +|_Value_|t |t |t |t |t |t |t |t |- |- |- |- |- |- |p1 |p0 | |Bitfields|Description| |---------|-----------| | _t_ | unsigned 24 bit counter of timer ticks since reset -| _p2_ | IRQ 2 (audio) interrupt pending if 1 | _p1_ | IRQ 1 (timer tick) interrupt pending if 1 | _p0_ | IRQ 0 (UART) interrupt pending if 1 diff --git a/doc/mem.md b/doc/mem.md index f7dbc2b..e24fbe2 100644 --- a/doc/mem.md +++ b/doc/mem.md @@ -34,4 +34,3 @@ Currently, only I/O slots 0-3 are being used. | 1 | $880 | SPI-SD | | 2 | $900 | VGA | | 3 | $980 | IRQC | -| 4 | $A00 | TDRAUDIO | diff --git a/doc/pascalprogramming.md b/doc/pascalprogramming.md index df5d3fd..f45a0be 100644 --- a/doc/pascalprogramming.md +++ b/doc/pascalprogramming.md @@ -103,16 +103,6 @@ Tridora-Pascal only supports the _break_ statement at the moment. The _exit_ statement can be used to exit the current procedure or function. If it is a function, the return value of the function is undefined if _exit_ is used before a return value is assigned. - -## Dynamic Memory Allocation -Memory allocation generally works as expected with the *new* and *dispose* special procedures. The variant of *new* with two parameters that is specified in Wirth Pascal is not supported (partial allocation of a variant record). Instead, there is a variant of *new* that has a second parameter for allocating strings (see above). - -If heap allocation fails, *new* does not return and instead causes a runtime error. To avoid this, a different special procedure called *newOrNil* can be used. This procedure sets the pointer -variable to *niL* if heap allocation fails. - -The function *MemAvail* returns the number of free bytes on the heap. It does not guarantee that this amount of memory can be allocated with *new*, because heap space can be fragmented. -The function *MaxAvail*, which exists in some versions of Turbo Pascal and returns the size of the largest contiguous block of available heap memory, is not (yet) implemented. - ## I/O I/O handling in Tridora Pascal is mostly compatible with other Pascal dialects when reading/writing simple variables from/to the console. There are big differences when opening/reading/writing files explicitly. @@ -163,12 +153,10 @@ var f:file; ### Error Handling When an I/O error occurs, the _IOResult_ function can be called to get the error code. Unlike TP, the _IOResult_ function requires a file variable as a parameter. When you call _IOResult_, an error that may have occurred is considered to be _acknowledged_. If an -error is not ackowledged and you do another I/O operation on that file, a runtime error is thrown. +error is not ackowledged and you do another I/O operation, a runtime error is thrown. That means you can either write programs without checking for I/O errors, while resting assured that the program will exit if an I/O error occurs. You can also choose to check for errors with _IOResult_ if you want to avoid having runtime errors. -If an I/O error occurs on a file, it is then considered closed. Closing a file in this state, or a file that has been closed normally, will cause a runtime error. - The function _ErrorStr_ from the standard library takes an error code as an argument and returns the corresponding textual description as a string. Example: @@ -203,8 +191,7 @@ Possible error codes from _IOResult_ are: | 8 | IOReadOnly | file is readonly | | | 9 | IOInvalidOp | invalid operation | | | 10 | IOInvalidFormat | invalid format | when parsing numbers with _read_ | -| 11 | IONoMem | not enough memory | heap allocation failed inside the standard library, e.g. open() | -| 12 | IOUserIntr | interrupted by user | program terminated by ^C, not visible from _IOResult_ | +| 11 | IOUserIntr | interrupted by user | program terminated by ^C, not visible from _IOResult_ | ### Read, Readln and Line Input In Turbo Pascal, using _read_ (and _readln_) from the console always waits until a complete line has been entered. diff --git a/doc/tdraudio.md b/doc/tdraudio.md deleted file mode 100644 index 999ebfc..0000000 --- a/doc/tdraudio.md +++ /dev/null @@ -1,104 +0,0 @@ -# Audio Controller -The audio controller provides four channels of 16-bit PCM audio playback. - -It uses multiple registers starting at address $A00. - -Each of the four channels has three registers. - -For the first channel the register addresses are: - -|Address|Description| -|-------|-----------| -| $A00 | Control Register | -| $A01 | Clock Divider Register | -| $A02 | Amplitude Register | - -The register addresses for the second channel start at $A04, -the third channel at $A08 -and the fourth channel at $A0C. - -## Reading the control register - -|_bit_ |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|- |- |- |- |- |- |- |- |- |-|- |- |- |- |- |- | - -|_bit_ |15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|- |- |- |- |- |- |- |- |- |- |- |i |f | e | p | c | - - -|Bitfields|Description| -|---------|-----------| -| _i_ | interrupt is enabled for this channel when 1 | -| _f_ | sample buffer is full when 1 | -| _e_ | sample buffer is empty when 1 | -| _p_ | changes from 0 to 1 and vice versa on each sample clock | -| _c_ | channel is enabled if 1 | - -## Writing the control register - -|_bit_ |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|- |- |- |- |- |- |- |- |- |-|- |- |- |- |- |- | - -|_bit_ |15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|- |- |- |- |- |- |- |- |- |- |- |i |- | - | - | c | - - -|Bitfields|Description| -|---------|-----------| -| _c_ | enable channel if 1, disable if 0 | -| _i_ | enable channel interrupt if 1, disable if 0 | - - -## Writing the clock divider register - -|_bit_ |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|d |d |d |d |d |d |d |d |d |d|d |d |d |d |d |d | - -|_bit_ |15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|d |d |d |d |d |d |d |d |d |d|d |d |d |d |d |d | - - -|Bitfields|Description| -|---------|-----------| -| _d_ | an unsigned 32-bit value for the clock divider | - - -## Writing the amplitude register - -|_bit_ |31|30|29|28|27|26|25|24|23|22|21|20|19|18|17|16| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|- |- |- |- |- |- |- |- |- |-|- |- |- |- |- |- | - -|_bit_ |15|14|13|12|11|10|09|08|07|06|05|04|03|02|01|00| -|- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- |- | -|_Value_|a |a |a |a |a |a |a |a |a |a |a |a |a | a | a | a | - - -|Bitfields|Description| -|---------|-----------| -| _a_ | an unsigned 16-bit value for the amplitude (sample) value with a bias of 32768 | - -## Notes -The clock divider specifies the number of CPU clock ticks between two samples. - -Writing to the amplitude register adds the sample value to the sample buffer. The sample buffer is organized as a FIFO with 16 elements. - -Amplitude (sample) values are represented as unsigned, biased 16-bit numbers. The bias is 32768, so given an amplitude range of 1.0 to -1.0, a 1.0 is represented by 65535, 0.0 by 32768 and -1.0 by 0. - -Interrupt processing needs to be enabled for each channel if required. - -An interrupt on any channel will be signalled to the interrupt controller -as IRQ 2. The interrupt service routine should check all running channels -for an emtpy buffer. - -If an audio interrupt has occured on a channel, the interrupt enable flag -is cleared for that channel. It needs to be re-enabled in the interrupt service routine. - -Interrupts also need to be enabled on the interrupt controller, -and re-enabled there after each interrupt. diff --git a/examples/LICENSES.md b/examples/LICENSES.md index 6f0bb8b..8992b88 100644 --- a/examples/LICENSES.md +++ b/examples/LICENSES.md @@ -7,9 +7,4 @@ https://commons.wikimedia.org/wiki/File:Ara-Zoo-Muenster-2013.jpg https://commons.wikimedia.org/wiki/File:Snow_leopard_portrait.jpg * shinkansen.pict: 投稿者が撮影, CC BY-SA 3.0 , via Wikimedia Commons https://commons.wikimedia.org/wiki/File:0key22-86.JPG -* Toco_Toucan.pict: Bernard DUPONT, CC BY-SA 2.0 , via Wikimedia Commons -https://commons.wikimedia.org/wiki/File:Toco_Toucan_(Ramphastos_toco)_-_48153967707.jpg -* 1911_Detroit_Electric.pict: Cullen328, CC BY-SA 3.0 , via Wikimedia Commons -https://commons.wikimedia.org/wiki/File:1911_Detroit_Electric.jpg -* ADDS-Envoy-620.pict: ADDS Envoy-1.jpg from terminals-wiki.org, CC-BY-SA 3.0 -https://terminals-wiki.org/wiki/index.php/File:ADDS_Envoy-1.jpg + diff --git a/examples/Toco_Toucan.pict b/examples/Toco_Toucan.pict deleted file mode 100644 index 341f692..0000000 Binary files a/examples/Toco_Toucan.pict and /dev/null differ diff --git a/examples/animate.pas b/examples/animate.pas index 0e4bb73..2869c46 100644 --- a/examples/animate.pas +++ b/examples/animate.pas @@ -24,7 +24,6 @@ var pic:PictData; infile:file; ch:char; stickMan:Sprite; - rocket:Sprite; procedure WaitVSync; external; @@ -81,12 +80,6 @@ begin aSprite.y := aSprite.y + aSprite.ydelta; if aSprite.x > 608 then aSprite.x := 0; - - if aSprite.y < 0 then - begin - aSprite.y := 200; - aSprite.x := 0; - end; end; aSprite.frameLeft := frameLeft; end; @@ -94,7 +87,6 @@ end; procedure animLoop; var i:integer; oldX,oldY:integer; - roldX,roldY:integer; begin stickMan.x := 0; stickMan.y := 310; @@ -104,39 +96,26 @@ begin stickMan.xdelta := 2; stickMan.ydelta := 0; - - rocket.x := 0; - rocket.y := 200; - rocket.frameTime := 1; - rocket.frameLeft := rocket.frameTime; - rocket.curFrame := 0; - rocket.xdelta := 2; - rocket.ydelta := -1; + oldX := stickMan.x; + oldY := stickMan.y; while not ConAvail do begin oldX := stickMan.x; oldY := stickMan.y; - - roldX := rocket.x; - roldY := rocket.y; - - PutSprite(roldX, roldY, rocket.frame[rocket.curFrame]); + PutSprite(oldX, oldY, stickMan.frame[stickMan.curFrame]); - animateSprite(rocket); animateSprite(stickMan); - - {Delay(1);} + Delay(10); WaitVSync; UndrawSprite(oldX, oldY, pic.pixeldata); - UndrawSprite(roldX, roldY, pic.pixeldata); end; end; begin - filename := 'background.pict'; + filename := 'grey.pict'; open(infile, filename, ModeReadonly); read(infile, pic); close(infile); @@ -146,19 +125,12 @@ begin loadPalette(pic); showPic(pic); - open(infile, 'walking.sprt', ModeReadOnly); + open(infile, 'Walking.sprt', ModeReadOnly); loadSpriteFrame(stickMan, 0, infile, 0); loadSpriteFrame(stickMan, 1, infile, 1); loadSpriteFrame(stickMan, 2, infile, 2); loadSpriteFrame(stickMan, 3, infile, 3); close(infile); - open(infile, 'rocket.sprt', ModeReadOnly); - loadSpriteFrame(rocket, 0, infile, 0); - loadSpriteFrame(rocket, 1, infile, 1); - loadSpriteFrame(rocket, 2, infile, 2); - loadSpriteFrame(rocket, 3, infile, 3); - close(infile); - animLoop; end. diff --git a/examples/background.pict b/examples/background.pict index 55e7a2c..76b99f6 100644 Binary files a/examples/background.pict and b/examples/background.pict differ diff --git a/examples/benchmarks.results.text b/examples/benchmarks.results.text index c05b034..5ae8a13 100644 --- a/examples/benchmarks.results.text +++ b/examples/benchmarks.results.text @@ -45,7 +45,6 @@ Running benchmarks.prog exp() 10K 00:00:29 cos() 10K 00:00:06 --------------------------------------- Arty-A7-35T 76.92MHz, 64KB SRAM, 256MB DRAM running in DRAM (except corelib, stdlib, runtime) @@ -69,7 +68,7 @@ Running benchmarks.prog exp() 10K 00:00:32 cos() 10K 00:00:06 --------------------------------------- + Arty-A7-35T 76.92MHz, 64KB SRAM, 256MB DRAM, 16B instruction cache running in DRAM (except corelib, stdlib, runtime) @@ -92,105 +91,3 @@ Running benchmarks.prog array copy 128k 1K 00:00:48 exp() 10K 00:00:32 cos() 10K 00:00:06 - --------------------------------------- -Arty-A7-35T -76.92MHz, 64KB SRAM, 256MB DRAM, - 16B instruction cache, 16B wt data cache -running in SRAM - -Running benchmarks.prog - empty loop 10M 00:00:07 - write variable 10M 00:00:17 - read variable 10M 00:00:20 - integer addition 10M 00:00:20 - real addition 1M 00:00:28 - integer multiplication 1M 00:01:11 - real multiplication 1M 00:00:59 - integer division 1M 00:01:36 - real division 1M 00:01:05 - string indexing 1M 00:00:39 - string iteration 1M 00:00:19 - new/dispose 1k 1M 00:00:19 - new/dispose 128k 1M 00:00:19 - array copy 1k 10K 00:00:03 - array copy 128k 1K 00:00:39 - exp() 10K 00:00:26 - cos() 10K 00:00:05 - - - --------------------------------------- -Arty-A7-35T -76.92MHz, 64KB SRAM, 256MB DRAM, - 16B instruction cache, 16B wb data cache -running in SRAM - -Running benchmarks.prog - empty loop 10M 00:00:04 - write variable 10M 00:00:11 - read variable 10M 00:00:18 - integer addition 10M 00:00:18 - real addition 1M 00:00:27 - integer multiplication 1M 00:00:49 - real multiplication 1M 00:00:58 - integer division 1M 00:01:06 - real division 1M 00:01:04 - string indexing 1M 00:00:36 - string iteration 1M 00:00:19 - new/dispose 1k 1M 00:00:18 - new/dispose 128k 1M 00:00:18 - array copy 1k 10K 00:00:03 - array copy 128k 1K 00:00:39 - exp() 10K 00:00:25 - cos() 10K 00:00:05 - --------------------------------------- -Arty-A7-35T -76.92MHz, 32KB SRAM, 256MB DRAM, - 16B instruction cache, 16B wb data cache -running in SRAM - -Running benchmarks.prog - empty loop 10M 00:00:04 - write variable 10M 00:00:11 - read variable 10M 00:00:18 - integer addition 10M 00:00:18 - real addition 1M 00:00:27 - integer multiplication 1M 00:00:49 - real multiplication 1M 00:00:58 - integer division 1M 00:01:06 - real division 1M 00:01:04 - string indexing 1M 00:00:36 - string iteration 1M 00:00:19 - new/dispose 1k 1M 00:00:18 - new/dispose 128k 1M 00:00:18 - array copy 1k 10K 00:00:03 - array copy 128k 1K 00:00:39 - exp() 10K 00:00:25 - cos() 10K 00:00:05 - --------------------------------------------- -Arty-A7-35T -76.92MHz, 64KB SRAM, 256MB DRAM, - 16B instruction cache, 16B wb data cache -running in DRAM (except corelib, stdlib, runtime) - -Running benchmarks.prog - empty loop 10M 00:00:10 - write variable 10M 00:00:11 - read variable 10M 00:00:11 - integer addition 10M 00:00:13 - real addition 1M 00:00:27 - integer multiplication 1M 00:00:35 - real multiplication 1M 00:00:43 - integer division 1M 00:01:05 - real division 1M 00:00:51 - string indexing 1M 00:00:36 - string iteration 1M 00:00:20 - new/dispose 1k 1M 00:00:23 - new/dispose 128k 1M 00:00:23 - array copy 1k 10K 00:00:03 - array copy 128k 1K 00:00:48 - exp() 10K 00:00:28 - cos() 10K 00:00:04 diff --git a/examples/fastfire.inc b/examples/fastfire.inc deleted file mode 100644 index bf0dce6..0000000 --- a/examples/fastfire.inc +++ /dev/null @@ -1,5 +0,0 @@ -const FIREWIDTH = 319; FIREHEIGHT = 79; (* keep in sync with fastfire.s! *) -type FireBuf = array [0..FIREHEIGHT, 0..FIREWIDTH] of integer; - -procedure FastFireUpdate(var f:FireBuf); external; -procedure FastFireDraw(var f:FireBuf;screenx, screeny:integer); external; diff --git a/examples/fastfire.s b/examples/fastfire.s deleted file mode 100644 index f0e10e4..0000000 --- a/examples/fastfire.s +++ /dev/null @@ -1,326 +0,0 @@ - ; width and height of the fire cell matrix - ; Be sure to sync this with fastfire.inc! - .EQU FIREWIDTH 319 - .EQU FIREHEIGHT 79 - - ; - ; The cell matrix actually has one column - ; and one row more than FIREWIDTH and - ; FIREHEIGHT to handle the negative - ; X offsets when calculating new - ; cell values. - ; Likewise, there is one more row. - ; So rows are processed from 0 to FIREHEIGHT - 2 - ; and columms from 1 to FIREWIDTH - 1. - - ; cells considered for calculating new - ; value for cell O (reference cells): - ; .....O...... - ; ....123..... - ; .....4...... - -; args: pointer to fire cell buffer - .EQU FF_ROW_COUNT 0 - .EQU FF_COL_COUNT 4 - .EQU FF_ROW_OFFS 8 - .EQU FF_OFFS1 12 - .EQU FF_OFFS2 16 - .EQU FF_OFFS3 20 - .EQU FF_OFFS4 24 - .EQU FF_CELL_PTR 28 - .EQU FF_FS 32 -FASTFIREUPDATE: - FPADJ -FF_FS - STORE FF_CELL_PTR - LOADC FIREHEIGHT-1 - STORE FF_ROW_COUNT - - ; calculate offsets for reference cells - LOADC FIREWIDTH+1 - SHL 2 - DUP - STORE FF_ROW_OFFS ; offset to next row: WIDTH*4 - DEC 4 ; offset to cell 1: row offset - 4 - DUP - STORE FF_OFFS1 - INC 4 - DUP - STORE FF_OFFS2 ; offset to cell 2: + 4 - INC 4 - STORE FF_OFFS3 ; offset to cell 3: + 4 - LOAD FF_ROW_OFFS - SHL 1 ; offset to cell 4: row offset * 2 - STORE FF_OFFS4 - - ; start at column 1 - LOAD FF_CELL_PTR - INC 4 - STORE FF_CELL_PTR -FF_ROW: - LOADC FIREWIDTH-1 - STORE FF_COL_COUNT - -FF_COL: - LOAD FF_CELL_PTR - LOAD FF_OFFS1 - ADD - LOADI - - LOAD FF_CELL_PTR - LOAD FF_OFFS2 - ADD - LOADI - - LOAD FF_CELL_PTR - LOAD FF_OFFS3 - ADD - LOADI - - LOAD FF_CELL_PTR - LOAD FF_OFFS4 - ADD - LOADI - - ADD - ADD - ADD - - SHR - SHR - - ; if new cell value > 0, subtract 1 to cool down - DUP - CBRANCH.Z FF_SKIP - DEC 1 -FF_SKIP: - LOAD FF_CELL_PTR ; load cell ptr - SWAP ; swap with new value - STOREI 4 ; store with postincrement - STORE FF_CELL_PTR ; save new ptr value - - LOAD FF_COL_COUNT ; decrement column count - DEC 1 - DUP - STORE FF_COL_COUNT - CBRANCH.NZ FF_COL ; loop if col count <> 0 - - ; at the end of a row, go to next row - ; by adding 8 to the cell pointer, - ; skipping the first cell of the next row - LOAD FF_CELL_PTR - INC 8 - STORE FF_CELL_PTR - - LOAD FF_ROW_COUNT ; decrement row count - DEC 1 - DUP - STORE FF_ROW_COUNT - CBRANCH.NZ FF_ROW ; loop if row count <> 0 - -FF_EXIT: - FPADJ FF_FS - RET - -; framebuffer controller registers - .EQU FB_RA $900 - .EQU FB_WA $901 - .EQU FB_IO $902 - .EQU FB_PS $903 - .EQU FB_PD $904 - .EQU FB_CTL $905 - .EQU WORDS_PER_LINE 80 - -; fire width in vmem words (strict left-to-right evaluation) - .EQU FFD_ROW_WORDS 1 + FIREWIDTH / 8 - -; draw all fire cells -; args: pointer to fire cell buffer, screen x, screen y - .EQU FFD_CELL_PTR 0 - .EQU FFD_X 4 - .EQU FFD_Y 8 - .EQU FFD_ROW_COUNT 12 - .EQU FFD_ROW_WORDCOUNT 16 - .EQU FFD_VMEM_PTR 20 - .EQU FFD_FS 24 -FASTFIREDRAW: - FPADJ -FFD_FS - STORE FFD_Y - STORE FFD_X - STORE FFD_CELL_PTR - - ; calculate video memory addr - ; addr = y * 80 + X / 8 - LOAD FFD_Y - SHL 2 ; y * 16 - SHL 2 - DUP - SHL 2 ; + y * 64 - ADD ; = y * 80 - - LOAD FFD_X - SHR - SHR - SHR - ADD ; + x / 8 - - DUP - STORE FFD_VMEM_PTR - LOADC FB_WA ; set vmem write address - SWAP - STOREI - DROP - - LOADC FIREHEIGHT + 1 - STORE FFD_ROW_COUNT -FFD_ROW: - LOADC FFD_ROW_WORDS - STORE FFD_ROW_WORDCOUNT - - LOADC FB_WA ; set vmem write address - LOAD FFD_VMEM_PTR - STOREI - DROP - -FFD_WORD: - LOAD FFD_CELL_PTR ; load cell ptr - LOADC 0 ; vmem word, start with 0 - - ; leftmost pixel (0) - OVER ; [ cptr, vmemw, cptr ] - LOADI ; load cell value [ cptr, vmemw, cellval ] - SHR ; scale it down (from 7 bits to 4) - SHR - SHR ; [ cptr, vmemw, cellval shr 3 ] - OR ; [ cptr, vmemw ] - SWAP ; [ vmemw, cptr ] - INC 4 ; increment cell ptr on stack [ vmemw, cptr + 4 ] - SWAP ; [ cptr + 4, vmemw ] - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 1 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 2 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 3 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 4 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 5 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 6 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - SHL 2 ; move bits to left for next pixel - SHL 2 - - ; pixel 7 - OVER - LOADI ; load cell value - SHR ; scale it down (from 7 bits to 4) - SHR - SHR - OR - SWAP - INC 4 ; increment cell ptr on stack - SWAP - - ; store word to vmem - ; vmem write addr will autoincrement - LOADC FB_IO - SWAP - STOREI - DROP - - STORE FFD_CELL_PTR - - ; prepare for next word - LOAD FFD_ROW_WORDCOUNT - DEC 1 - DUP - STORE FFD_ROW_WORDCOUNT - CBRANCH.NZ FFD_WORD - - ; prepare for next row - LOAD FFD_VMEM_PTR - LOADC WORDS_PER_LINE - ADD - STORE FFD_VMEM_PTR - - LOAD FFD_ROW_COUNT - DEC 1 - DUP - STORE FFD_ROW_COUNT - CBRANCH.NZ FFD_ROW -FFD_EXIT: - FPADJ FFD_FS - RET diff --git a/examples/fire.pas b/examples/fire.pas deleted file mode 100644 index 22f0217..0000000 --- a/examples/fire.pas +++ /dev/null @@ -1,76 +0,0 @@ -{$H1} -{$S2} -program fire; -const MAXX = 30; - MAXY = 50; -var firebuf: array [0..MAXY, 0..MAXX] of integer; - - firepalette: array [0..15] of integer = - ( $FFA, $FF8, $FF4, $FF0, $FE0, $FD0, $FA0, $F90, - $F00, $E00, $D00, $A00, $800, $600, $300, $000); - x,y:integer; - -procedure createPalette; -var i:integer; -begin - for i := 15 downto 0 do - setpalette(15 - i, firepalette[i]); -end; - -procedure fireItUp; -var x,y:integer; -begin - y := MAXY - 1; - for x := 1 to MAXX - 1 do - firebuf[y, x] := random and 127; -end; - -procedure updateFire; -var i,x,y:integer; -begin - for y := 0 to MAXY - 2 do - for x := 1 to MAXX - 1 do - begin - i := - ((firebuf[y + 1, x - 1] - + firebuf[y + 1, x] - + firebuf[y + 1, x + 1] - + firebuf[y + 2, x]) - ) shr 2; - if i > 0 then - i := i - 1; - firebuf[y, x] := i; - end; -end; - -procedure drawFire; -var x, y, col:integer; -begin - for y := 0 to MAXY - 1 do - begin - x := 0; - for col in firebuf[y] do - begin - putpixel(300 + x, 150 + y, col shr 3); - x := x + 1; - end; - end; -end; - -begin - randomize; - initgraphics; - createPalette; - while not conavail do - begin - fireItUp; - updateFire; - drawFire; - end; - - for y := 0 to MAXY do - begin - x := firebuf[y, 10]; - drawline(0, y, x, y, 1); - end; -end. diff --git a/examples/fire2.pas b/examples/fire2.pas deleted file mode 100644 index 72fb254..0000000 --- a/examples/fire2.pas +++ /dev/null @@ -1,84 +0,0 @@ -{$H1} -{$S1} -program fire2; -uses fastfire; - -const MAXX = FIREWIDTH; - MAXY = FIREHEIGHT; - -var firecells: FireBuf; - - firepalette: array [0..15] of integer = - { ( $FFA, $FF8, $FF4, $FF0, $FE0, $FD0, $FA0, $F90, - $F00, $E00, $D00, $A00, $800, $600, $300, $000); } - ( $FFA, $FFA, $FFA, $FFA, $FF0, $FF0, $FF0, $FF0, - $FF0, $FD0, $FA0, $C00, $A00, $700, $400, $000); - x,y:integer; - -procedure createPalette; -var i:integer; -begin - for i := 15 downto 0 do - setpalette(15 - i, firepalette[i]); -end; - -procedure fireItUp; -var x,y:integer; -begin - y := MAXY - 1; - for x := 1 to MAXX - 1 do - firecells[y, x] := random and 127; -end; - - -procedure updateFire; -var i,x,y:integer; -begin - for y := 0 to MAXY - 2 do - for x := 1 to MAXX - 1 do - begin - i := - ((firecells[y + 1, x - 1] - + firecells[y + 1, x] - + firecells[y + 1, x + 1] - + firecells[y + 2, x]) - ) shr 2; - if i > 0 then - i := i - 1; - firecells[y, x] := i; - end; -end; - -procedure drawFire; -var x, y, col:integer; -begin - for y := 0 to MAXY - 1 do - begin - x := 0; - for col in firecells[y] do - begin - putpixel(100 + x, 150 + y, col shr 3); - x := x + 1; - end; - end; -end; - -begin - randomize; - initgraphics; - createPalette; - while not conavail do - begin - fireItUp; - FastFireUpdate(firecells); - { updateFire; } - FastFireDraw(firecells, 160, 100); - { drawFire; } - end; - - for y := 0 to MAXY do - begin - x := firecells[y, 10]; - drawline(0, y, x, y, 1); - end; -end. diff --git a/examples/pcmtest.pas b/examples/pcmtest.pas deleted file mode 100644 index 423faaf..0000000 --- a/examples/pcmtest.pas +++ /dev/null @@ -1,47 +0,0 @@ -{$H1536} -program pcmtest; -uses pcmaudio; - -var filename:string; - buf:SndBufPtr; - f:file; - size:integer; - i:integer; - c:char; - sampleRate:integer; - err:integer; -begin - if ParamCount > 0 then - filename := ParamStr(1) - else - begin - write('Filename> '); - readln(filename); - end; - - err := 1; - if ParamCount > 1 then - val(ParamStr(2),sampleRate, err); - - if err <> 0 then - sampleRate := 16000; - - open(f, filename, ModeReadOnly); - size := FileSize(f); - new(buf, size); - - buf^ := ''; - write('Reading ', size, ' bytes...'); - for i := 1 to size do - begin - read(f,c); - AppendChar(buf^,c); - end; - writeln; - - close(f); - - PlaySample(buf, sampleRate); - - dispose(buf); -end. diff --git a/examples/pcmtest2.pas b/examples/pcmtest2.pas deleted file mode 100644 index f72e5e6..0000000 --- a/examples/pcmtest2.pas +++ /dev/null @@ -1,74 +0,0 @@ -{$H2560} -program pcmtest2; -uses pcmaudio; - -var filename:string; - buf:SndBufPtr; - sampleRate:integer; - err:integer; - done:boolean; - c:char; - -function readAudioFile(fname:string):SndBufPtr; -var i,size:integer; - c:char; - buf:SndBufPtr; - f:file; -begin - open(f, fname, ModeReadOnly); - size := FileSize(f); - new(buf, size); - - buf^ := ''; - write('Reading ', size, ' bytes...'); - for i := 1 to size do - begin - read(f,c); - AppendChar(buf^,c); - end; - writeln; - - close(f); - - readAudioFile := buf; -end; - -begin - if ParamCount > 0 then - filename := ParamStr(1) - else - begin - write('Filename> '); - readln(filename); - end; - - err := 1; - if ParamCount > 1 then - val(ParamStr(2), sampleRate, err); - if err > 0 then - sampleRate := 32000; - - buf := readAudioFile(filename); - - SampleQStart(buf, sampleRate); - - write('Press ESC to stop> '); - done := false; - while not done do - begin - read(c); - if c = #27 then - begin - done := true; writeln(';'); - end - else - if c = '?' then - begin - writeln; writeln('Queue: ', SampleQSize); - end; - end; - - SampleQStop; - - dispose(buf); -end. diff --git a/examples/rocket.sprt b/examples/rocket.sprt deleted file mode 100644 index 3108b4a..0000000 Binary files a/examples/rocket.sprt and /dev/null differ diff --git a/examples/shinkansen.pict b/examples/shinkansen.pict index e180d5b..7b1ac55 100644 Binary files a/examples/shinkansen.pict and b/examples/shinkansen.pict differ diff --git a/examples/snow_leopard.pict b/examples/snow_leopard.pict index 91422f7..8ea4ab8 100644 Binary files a/examples/snow_leopard.pict and b/examples/snow_leopard.pict differ diff --git a/examples/xmas.pas b/examples/xmas.pas index 406e944..12b2da3 100644 --- a/examples/xmas.pas +++ b/examples/xmas.pas @@ -1,7 +1,3 @@ -(* This program does not work anymore, because - it uses the old sprite routines with 16x16 sprites. - It is only included for historical reasons. - *) program XmasAnimation; uses sprites; diff --git a/lib/corelib.s b/lib/corelib.s index 8b8f403..6970971 100644 --- a/lib/corelib.s +++ b/lib/corelib.s @@ -612,9 +612,6 @@ WAIT1LOOP: ; length must be multiple of wordsize. ; if it is not, the last (partial) word is not cleared. _CLEARMEM: - OVER ; check for null pointer - CBRANCH.Z CLEARMEM_X - SHR SHR ; calculate length in words diff --git a/lib/pcmaudio.inc b/lib/pcmaudio.inc deleted file mode 100644 index 4c3cdb3..0000000 --- a/lib/pcmaudio.inc +++ /dev/null @@ -1,7 +0,0 @@ -type SndBuf = string[32768]; -type SndBufPtr = ^SndBuf; - -procedure PlaySample(buf:SndBufPtr;sampleRate:integer); external; -procedure SampleQStart(buf:SndBufPtr;sampleRate:integer); external; -procedure SampleQStop; external; -function SampleQSize:integer; external; diff --git a/lib/pcmaudio.s b/lib/pcmaudio.s deleted file mode 100644 index d1add4f..0000000 --- a/lib/pcmaudio.s +++ /dev/null @@ -1,247 +0,0 @@ - .EQU AUDIO_BASE $A00 - .EQU IRQC_REG $980 - .EQU IRQC_EN $80 - -; args: sample rate -START_PCMAUDIO: - ; calculate clock divider - LOADCP 77000000 - SWAP - LOADCP _DIV - CALL - - LOADC AUDIO_BASE + 1 - SWAP ; put clock divider on ToS -; LOADCP 4812 ; clock divider for 16KHz sample rate -; LOADCP 2406 ; clock divider for 32KHz sample rate - STOREI 1 - LOADCP 32768 ; set amplitude to biased 0 - STOREI - DROP - LOADC AUDIO_BASE - LOADC 17 ; enable channel, enable interrupt - STOREI - DROP - RET - -STOP_AUDIO: - LOADC AUDIO_BASE - LOADC 0 - STOREI - DROP - RET - -; args: pointer to pascal string, sample rate - .EQU PS_PTR 0 - .EQU PS_COUNT 4 - .EQU PS_FS 12 -PLAYSAMPLE: - FPADJ -PS_FS - - LOADCP START_PCMAUDIO - CALL - - DUP - LOADI ; get string size from header - SHR ; divide by 4 to get word count - SHR - - STORE PS_COUNT - INC 8 ; skip rest of header - STORE PS_PTR ; store sample data pointer - -PS_L0: - LOAD PS_PTR ; load pointer - INC.S1.X2Y 4 ; increment and keep old value - STORE PS_PTR ; store incremented value - - LOADI ; load 32 bit word - DUP - BROT ; get upper 16 bit word - BROT - LOADCP $FFFF - AND - - LOADCP PLAY_1SAMPLE - CALL - - LOADCP $FFFF ; get lower 16 bit word - AND - LOADCP PLAY_1SAMPLE - CALL - - LOAD PS_COUNT ; load word count - DEC 1 ; decrement - DUP - STORE PS_COUNT - CBRANCH.NZ PS_L0 ; loop if not zero - - LOADCP STOP_AUDIO - CALL - - FPADJ PS_FS - RET - -; play one sample, waiting -; for the clock divider, which -; is visible via the phase flag -; args: 16-bit unsigned sample -PLAY_1SAMPLE: - -PLAY1_L0: - LOADC AUDIO_BASE - LOADI - LOADC 8 ; get fifo_full flag - AND - CBRANCH.NZ PLAY1_L0 ; loop if fifo is full - - LOADC AUDIO_BASE+2 ; store amplitude value - SWAP - STOREI - DROP - RET - -; start interrupt-driven sample playback -; args: pointer to pascal string, sample rate -SAMPLEQSTART: - LOADCP START_PCMAUDIO - CALL - - LOADCP SMPLQ_COUNT - OVER - LOADI ; get string size from header - SHR ; divide by 4 to get word count - SHR - - STOREI - DROP - - LOADCP SMPLQ_PTR - SWAP - INC 8 ; skip rest of header - STOREI ; store sample data pointer - DROP - - LOADCP SMPLQ_ISR ; set interrupt handler - STOREREG IV - - LOADC IRQC_REG ; enable irq - LOADC IRQC_EN - STOREI - DROP - - RET - -SAMPLEQSTOP: - LOADCP SMPLQ_PTR - LOADC 0 - STOREI - DROP - - LOADCP STOP_AUDIO - CALL - - LOADC IRQC_REG ; disable irq - LOADC 0 - STOREI - DROP - RET - -SAMPLEQSIZE: - LOADCP SMPLQ_COUNT - LOADI - RET - -SMPLQ_PTR: .WORD 0 -SMPLQ_COUNT: .WORD 0 - -SMPLQ_ISR: - LOADC IRQC_REG - LOADI - LOADC 4 ; check for audio interrupt - AND - CBRANCH.Z SMPLQ_I_XT ; if flag not set, exit - -SMPLQ_I_L: - LOADCP SMPLQ_PTR - LOADI ; load word pointer - DUP - CBRANCH.NZ SMPLQ_I_B ; check for null pointer - DROP - BRANCH SMPLQ_I_XT ; if null, end interrupt routine -SMPLQ_I_B: - LOADI ; load next word - DUP - - BROT ; get high half-word - BROT - LOADCP $FFFF - AND - - LOADC AUDIO_BASE+2 - SWAP - STOREI ; write sample, keep addr - - SWAP ; addr to NoS, lower halfword on ToS - LOADCP $FFFF - AND - STOREI ; write sample - DROP - - ; decrement word count - LOADCP SMPLQ_COUNT - LOADI.S1.X2Y ; load counter, keep addr - DEC 1 - DUP - CBRANCH.Z SMPLQ_I_END ; end if zero - - STOREI ; store new counter value - DROP - - ; increment pointer - LOADCP SMPLQ_PTR - LOADI.S1.X2Y - INC 4 - STOREI - DROP - - ; check if fifo is full - LOADC AUDIO_BASE - LOADI - LOADC 8 ; fifo_full - AND - CBRANCH.Z SMPLQ_I_L ; next sample if not full - - LOADC AUDIO_BASE - LOADC 17 ; re-enable channel interrupt - STOREI - DROP - - BRANCH SMPLQ_I_XT - - ; end playback, set ptr and counter to zero -SMPLQ_I_END: - DROP - DROP - LOADCP SMPLQ_PTR - LOADC 0 - STOREI - DROP - LOADCP SMPLQ_COUNT - LOADC 0 - STOREI - DROP - - ; set amplitude out to zero (biased) - LOADC AUDIO_BASE+2 - LOADCP 32768 - STOREI - DROP - -SMPLQ_I_XT: - LOADC IRQC_REG ; re-enable interrupts - LOADC IRQC_EN - STOREI - DROP - LOADREG IR ; jump via interrupt return register - JUMP diff --git a/lib/runtime.s b/lib/runtime.s index 9eb35d7..6f248b9 100644 --- a/lib/runtime.s +++ b/lib/runtime.s @@ -1764,34 +1764,6 @@ MEM_DUMP_L0: DROP RET -; calculate total free heap space -; args: none -; returns: cumulative size of all free chunks in bytes -MEMAVAIL: - FPADJ -4 - LOADC 0 - STORE 0 ; start with zero as result - - LOADCP _HEAP_ANCHOR -MAV_L: - DUP ; dup chunk ptr for later - INC 4 ; move to size field - LOADI ; load chunk size - LOAD 0 ; add to current result value - ADD - STORE 0 - - LOADI ; load next ptr - DUP - LOADCP _HEAP_ANCHOR ; compare with anchor - CMPU NE - CBRANCH MAV_L ; if not equal, loop -MAX_XT: - DROP ; drop chunk ptr - LOAD 0 ; put result value on stack - FPADJ 4 - RET - ; check if a pointer is part of the free list ; args: pointer returned by MEM_ALLOC ; throws runtime error if the pointer is found @@ -1931,12 +1903,6 @@ _CLEARESTACK_XT: ; Terminate program: clear estack and ; jump to coreloader PTERM: - ; just to be safe, disable interrupts - LOADC $980 - LOADC 0 - STOREI - DROP - LOADCP _CLEARESTACK CALL LOADCP LOADER_START diff --git a/lib/sdcardlib.s b/lib/sdcardlib.s index eca85d4..9b45e05 100644 --- a/lib/sdcardlib.s +++ b/lib/sdcardlib.s @@ -264,8 +264,8 @@ CARD_OK: ; set fast transfer rate CARDFASTCLK: LOADC SPIREG - ; set clock divider to ~2.75MHz - LOADCP SPI_CLK_DIV_WR,7 ; using the LOADCP with offset syntax here + ; set clock divider to ~2,6MHz + LOADCP SPI_CLK_DIV_WR,10 ; using the LOADCP with offset syntax here STOREI DROP RET diff --git a/lib/stdlib.inc b/lib/stdlib.inc index 5304403..e0b08a7 100644 --- a/lib/stdlib.inc +++ b/lib/stdlib.inc @@ -18,9 +18,8 @@ const IONoError = 0; IOReadOnly = 8; IOInvalidOp = 9; IOInvalidFormat = 10; - IONoMem = 11; - IOUserIntr = 12; - IOMaxErr = 12; + IOUserIntr = 11; + IOMaxErr = 11; const PArgMax = 7; @@ -149,7 +148,6 @@ procedure appendchar(var s:string; aChar:char); external; procedure strmoveup(var s:string;index,length,delta:integer); external; procedure strmovedown(var s:string;index,length,delta:integer); external; procedure RuntimeError(var s:string); external; -function MemAvail:integer; external; (* from stdlib *) function copy(s:string[256];index,count:integer):string[256]; external; @@ -207,7 +205,7 @@ procedure readvolumeblks(volumeid:integer; destbuf:^iobuffer; blkno:integer; blk procedure writevolumeblks(volumeid:integer; srcbuf:^iobuffer; blkno:integer; blkCount: integer; var error:integer); external; function findvolume(name:string):integer; external; -procedure openvolumeid(volid:integer;var error:integer); external; +procedure openvolumeid(volid:integer); external; procedure closevolumeid(volid:integer); external; function IOResult(var fil:file):integer; external; function ErrorStr(err:integer):string; external; diff --git a/lib/stdlib.pas b/lib/stdlib.pas index 84025b3..8ad45d9 100644 --- a/lib/stdlib.pas +++ b/lib/stdlib.pas @@ -26,9 +26,8 @@ const IONoError = 0; IOReadOnly = 8; IOInvalidOp = 9; IOInvalidFormat = 10; - IONoMem = 11; - IOUserIntr = 12; - IOMaxErr = 12; + IOUserIntr = 11; + IOMaxErr = 11; const PArgMax = 7; @@ -134,7 +133,7 @@ var DefaultVolumeId:integer; character to the runtime error routine which takes null-terminated strings. *) -var ioerrordesc: array [0..IOMaxErr] of string[20] = ( +var ioerrordesc: array [0..11] of string[20] = ( 'No error', 'File not found', 'Volume not found', @@ -146,7 +145,6 @@ var ioerrordesc: array [0..IOMaxErr] of string[20] = ( 'File is readonly', 'Invalid operation', 'Invalid format', - 'Not enough memory', 'Interrupted by user' ); @@ -1185,17 +1183,7 @@ ext: code := 0; end else - begin - if i = 1 then (* empty string gives error position 1 *) - code := 1 - else - code := i - 1; - end; -end; - -procedure errorhalt(var fil:file); -begin - RuntimeError(ioerrordesc[fil.lastError]); + code := i - 1; end; procedure checkerror(var fil:file); @@ -1203,7 +1191,7 @@ begin if fil.lastError <> 0 then begin if not fil.errorAck then - errorhalt(fil) + RuntimeError(ioerrordesc[fil.lastError]) else begin fil.lastError := 0; @@ -1346,16 +1334,12 @@ procedure freadreal(var v:real;var f:file); var buf:string[40]; errpos:integer; begin - errpos := -1; fskipwhite(f); fscanbuf(f,ScanReal, buf); if f.lastError = 0 then val(buf, v, errpos); if errpos <> 0 then - begin fileerror(f, IOInvalidFormat); - checkerror(f); - end; end; procedure freadstring(var s:string; var f:file); @@ -1556,17 +1540,13 @@ begin end; end; -procedure openvolumeid(volid:integer;var error:integer); +procedure openvolumeid(volid:integer); begin - error := 0; with volumeTable[volid] do begin if dirCache = nil then - newOrNil(dirCache); - if dirCache <> nil then - openFilesCount := openFilesCount + 1 - else - error := IONoMem; + new(dirCache); + openFilesCount := openFilesCount + 1; end; end; @@ -1685,21 +1665,12 @@ begin { writeln(' readbuf data: ', fil.buffer^[0][0]); } end; -procedure close(var aFile:file); forward; - -(* Set error state on file and close it. - Buffer will not be flushed as that might - have caused the error. -*) procedure fileerror(var fil:file; error:integer); begin + (* should check if there was an error already + and throw a runtime error in that case *) fil.lastError := error; fil.errorAck := false; - if fil.buffer <> nil then - begin - fil.needsflush := false; - close(fil); - end; end; function IOResult(var fil:file):integer; @@ -1844,8 +1815,6 @@ end; function filesize(var fil:file):integer; begin - checkerror(fil); - if fil.typ = IOChannel then filesize := -1 else @@ -2044,28 +2013,23 @@ begin aFile.typ := IODiskFile; aFile.mode := mode; - newOrNil(aFile.buffer); - if aFile.buffer = nil then - fileerror(aFile, IONoMem) - else - begin - aFile.bufpos := 0; - aFile.bufsize := DefaultBufSize; - aFile.needsflush := false; - aFile.changed := false; - aFile.lastError := 0; - aFile.errorAck := false; - aFile.volumeid := volid; - aFile.fileno := slotno; - aFile.filpos := 0; - aFile.bufStart := 1; - aFile.size := dirslot.sizeBytes; - aFile.sizeExtents := dirslot.sizeBytes div extentSize + 1; - aFile.bufBlocks := DefaultBufBlocks; - aFile.extentBlocks := extentSize div 512; + new(aFile.buffer); + aFile.bufpos := 0; + aFile.bufsize := DefaultBufSize; + aFile.needsflush := false; + aFile.changed := false; + aFile.lastError := 0; + aFile.errorAck := false; + aFile.volumeid := volid; + aFile.fileno := slotno; + aFile.filpos := 0; + aFile.bufStart := 1; + aFile.size := dirslot.sizeBytes; + aFile.sizeExtents := dirslot.sizeBytes div extentSize + 1; + aFile.bufBlocks := DefaultBufBlocks; + aFile.extentBlocks := extentSize div 512; - seek(aFile,0); - end; + seek(aFile,0); end; procedure updatedirslot(var aFile:file); @@ -2088,22 +2052,19 @@ procedure close(var aFile:file); begin if aFile.typ = IODiskFile then begin - if aFile.lastError = IOFileClosed then - errorhalt(aFile); { writeln('close needsflush:', aFile.needsflush, ' changed:', aFile.changed, ' error:', aFile.lastError); } if aFile.needsflush then flushfile(aFile); - - { writeln('close f.buffer:', aFile.buffer); } - dispose(aFile.buffer); - aFile.buffer := nil; - if aFile.lastError = 0 then begin + fileerror(aFile, IOFileClosed); + { writeln('close f.buffer:', aFile.buffer); } + dispose(aFile.buffer); + aFile.buffer := nil; + if aFile.changed then updatedirslot(aFile); - if aFile.lastError = 0 then - fileerror(aFile, IOFileClosed); + end; closevolumeid(aFile.volumeid); @@ -2282,9 +2243,8 @@ begin if volid > 0 then begin - openvolumeid(volid, error); - if error = 0 then - slotno := findfile(volid, fname, dirs, error) + openvolumeid(volid); + slotno := findfile(volid, fname, dirs, error) end else error := IOVolNotFound; diff --git a/pcomp/Makefile b/pcomp/Makefile index e183f73..4200997 100644 --- a/pcomp/Makefile +++ b/pcomp/Makefile @@ -3,17 +3,12 @@ SASM=./sasm LSYMGEN=./lsymgen .SUFFIXES: -.SUFFIXES: .pas .o .s .prog - -.pas.s: - $(PCOMP) $< -.s.prog: - $(SASM) $< +.SUFFIXES: .pas .o .pas: fpc -Mobjfpc -gl $< -all: pcomp sasm sdis lsymgen shortgen nativeprogs +all: pcomp sasm sdis lsymgen shortgen libs: pcomp sasm lsymgen shortgen $(SASM) ../lib/coreloader.s @@ -22,23 +17,32 @@ libs: pcomp sasm lsymgen shortgen $(SASM) ../lib/stdlibwrap.s ../lib/stdlib.lib $(LSYMGEN) ../lib/stdlibwrap.sym ../lib/stdlib.lsym -test: sasm.s pcomp.s lsymgen.s shortgen.s +nativecomp: pcomp sasm libs + $(PCOMP) sasm.pas + $(PCOMP) pcomp.pas + $(PCOMP) lsymgen.pas + $(PCOMP) shortgen.pas -testprgs: sasm.prog pcomp.prog lsymgen.prog shortgen.prog - -nativecomp: libs pcomp.prog sasm.prog lsymgen.prog shortgen.prog - -nativeprogs: pcomp ../progs/shell.prog ../progs/editor.prog ../progs/reclaim.prog \ - ../progs/dumpdir.prog ../progs/partmgr.prog ../progs/xfer.prog \ - ../progs/recover.prog ../progs/changemem.prog +nativeprogs: nativecomp + $(PCOMP) ../progs/shell.pas + $(PCOMP) ../progs/editor.pas + $(PCOMP) ../progs/reclaim.pas + $(PCOMP) ../progs/dumpdir.pas + $(PCOMP) ../progs/partmgr.pas + $(PCOMP) ../progs/xfer.pas + $(PCOMP) ../progs/recover.pas $(SASM) ../lib/rommon.s $(SASM) -A ../lib/rommon.s ../lib/rom.mem -examples: nativecomp ../tests/readtest.prog ../tests/readchartest.prog ../tests/timetest.prog \ - ../tests/test133.prog ../tests/cchangetest.prog ../tests/tree.prog +examples: nativecomp + $(PCOMP) ../tests/readtest.pas + $(PCOMP) ../tests/readchartest.pas + $(PCOMP) ../tests/timetest.pas + $(PCOMP) ../tests/test133.pas -$(PCOMP) ../examples/chase.pas - -$(SASM) ../examples/chase.s + $(PCOMP) ../tests/cchangetest.pas + $(PCOMP) ../tests/tree.pas -$(MAKE) -C ../rogue -f Makefile.tridoracpu clean: - rm -f pcomp sasm sdis libgen lsymgen *.o *.s *.prog + rm -f pcomp sasm sdis libgen lsymgen *.o *.s diff --git a/pcomp/emit.pas b/pcomp/emit.pas index d440951..a201714 100644 --- a/pcomp/emit.pas +++ b/pcomp/emit.pas @@ -324,9 +324,7 @@ begin rewindStringList(usedUnits); while nextStringListItem(usedUnits, unitName) do emitInclude(unitName + UnitSuffix2); - (* _END label needs to be word-aligned because - it is used as the start of the heap *) - emitIns('.ALIGN'); + emitLabelRaw('_END'); end; diff --git a/pcomp/make.bat b/pcomp/make.bat index 564885d..0db1f59 100644 --- a/pcomp/make.bat +++ b/pcomp/make.bat @@ -28,7 +28,6 @@ py pcomp.py ..\progs\dumpdir.pas py pcomp.py ..\progs\partmgr.pas py pcomp.py ..\progs\xfer.pas py pcomp.py ..\progs\recover.pas -py pcomp.py ..\progs\changemem.pas sasm ..\lib\rommon.s sasm -A ..\lib\rommon.s ..\lib\rom.mem diff --git a/pcomp/pcomp.pas b/pcomp/pcomp.pas index 73947a1..d7be8a5 100644 --- a/pcomp/pcomp.pas +++ b/pcomp/pcomp.pas @@ -43,7 +43,7 @@ type TokenType = ( ArrayType, RecordType, PointerType, StringCharType, EnumType, SetType, UnresolvedType ); - SpecialProc = ( NoSP, NewSP, New0SP, DisposeSP, ReadSP, WriteSP, ReadlnSP, WritelnSP, + SpecialProc = ( NoSP, NewSP, DisposeSP, ReadSP, WriteSP, ReadlnSP, WritelnSP, SetlengthSP, ValSP, StrSP, ExitSP ); SpecialFunc = ( NoSF, TruncSF, FracSF, IntSF, SqrSF, SuccSF, PredSF, OddSF, ChrSF, OrdSF, AbsSF); @@ -291,7 +291,7 @@ var 'UNIT', 'IMPLEMENTATION', 'INTERFACE', 'USES', '_' ); specialprocnames: array [SpecialProc] of string[12] = ( - '_', 'NEW', 'NEWORNIL', 'DISPOSE', 'READ', 'WRITE', 'READLN', 'WRITELN', 'SETLENGTH', + '_', 'NEW', 'DISPOSE', 'READ', 'WRITE', 'READLN', 'WRITELN', 'SETLENGTH', 'VAL','STR', 'EXIT'); specialfuncnames: array [SpecialFunc] of string[8] = ( '_', 'TRUNC', 'FRAC', 'INT', 'SQR', 'SUCC', 'PRED', 'ODD', @@ -4500,7 +4500,7 @@ begin isFunction := aProc^.returnType.baseType <> NoType; end; -procedure parseNew(checkNil:boolean); +procedure parseNew; var memLoc: MemLocation; typeReturn: TypeSpec; begin @@ -4526,17 +4526,17 @@ begin emitLoadConstantInt(memLoc.typ.pointedType^.size); emitMemAlloc; - (*We need to call CLEARMEM when the allocated type - contains strings. - INITSTRING checks if the header is non-zero to see if - the string is already initialized, and the allocated - chunk might contain random data so it would look - like an initialized string. *) if typeContainsString(memLoc.typ.pointedType^) then emitClearAlloc(memLoc.typ.pointedType); end; - if checkNil then - emitCheckAlloc; + emitCheckAlloc; + + (*We need to call CLEARMEM when the allocated type + contains strings. + INITSTRING checks if the header is non-zero to see if + the string is already initialized, and the allocated + chunk might contain random data so it would look + like an initialized string. *) writeVariable(memLoc); @@ -5017,9 +5017,7 @@ begin NoSP: errorExit2('internal error in parseSpecialProcCall', lastToken.tokenText); NewSP: - parseNew(true); - New0SP: - parseNew(false); + parseNew; DisposeSP: parseDispose; ReadSP: diff --git a/pcomp/sasm.pas b/pcomp/sasm.pas index d032748..7b01f32 100644 --- a/pcomp/sasm.pas +++ b/pcomp/sasm.pas @@ -1,7 +1,7 @@ (* Copyright 2021-2024 Sebastian Lederer. See the file LICENSE.md for details *) {$MODE objfpc} {$H600} -{$S32} +{$S4} program sasm; {$!}{$ifdef FPC}uses math,crt;{$endif} {$R+} @@ -2056,9 +2056,6 @@ begin operandValue := 0; emitBlock(count, operandValue); end - else - if lastToken.tokenText = '.ALIGN' then - alignOutput(wordSize) else errorExit2('Unrecognized directive', lastToken.tokenText); end; diff --git a/progs/changemem.pas b/progs/changemem.pas deleted file mode 100644 index 7c0bca8..0000000 --- a/progs/changemem.pas +++ /dev/null @@ -1,173 +0,0 @@ -program changemem; -const ProgramMagic = $00100AFE; -type ProgramHeader = record - magic:integer; - heapSize:integer; - stackSize:integer; - mainPtr:integer; - end; - -var filename:string; - h:ProgramHeader; - -procedure showHex(value:integer); -var i:integer; - digit:integer; - digits:array[1..8] of char; - ch:char; -begin - for i := 1 to 8 do - begin - digit := value and 15; - value := value shr 4; - - if digit < 10 then - ch := chr(digit + ord('0')) - else - ch := chr(digit - 10 + ord('A')); - digits[i] := ch; - end; - for i := 8 downto 1 do - write(digits[i]); -end; - -procedure showValue(labl:string; value:integer); -begin - write(labl:20, ' '); - write(value:8, ' ('); - showHex(value); - writeln(')'); -end; - -procedure showHeader(var h:ProgramHeader); -begin - showValue('heap size', h.heapSize); - showValue('stack size', h.stackSize); - showValue('main entry point', h.mainPtr); -end; - -procedure readHeader(var filename:string;var h:ProgramHeader); -var f:file; -begin - writeln('reading file ', filename); - open(f, filename, ModeReadOnly); - if IOResult(f) <> 0 then - begin - writeln('Error opening file: ', ErrorStr(IOResult(f))); - halt; - end - else - begin - read(f, h); - if IOResult(f) <> 0 then - begin - writeln('Error reading header: ', ErrorStr(IOResult(f))); - halt; - end; - close(f); - end; -end; - -procedure writeHeader(var filename:string;var h:ProgramHeader); -var f:file; -begin - writeln('writing file ', filename); - open(f, filename, ModeModify); - if IOResult(f) <> 0 then - begin - writeln('Error opening file: ', ErrorStr(IOResult(f))); - halt; - end - else - begin - write(f, h); - if IOResult(f) <> 0 then - begin - writeln('Error writing header: ', ErrorStr(IOResult(f))); - halt; - end; - close(f); - end; -end; - -procedure modifyHeader(var filename:string;var h:ProgramHeader); -var done:boolean; - ch:char; - changed:boolean; - - function getNewValue(descr:string):integer; - var buf:string; - v,e:integer; - begin - getNewValue := 0; - write('New ',descr, ' size (decimal)> '); - readln(buf); - val(buf, v, e); - if(e > 0 ) or (v <= 0) then - writeln('invalid size') - else - getNewValue := v; - end; - - procedure changeStackSize; - var v:integer; - begin - v := getNewValue('stack'); - if v > 0 then - begin - h.stackSize := v; - changed := true; - end; - end; - - procedure changeHeapSize; - var v:integer; - begin - v := getNewValue('heap'); - if v > 0 then - begin - h.heapSize := v; - changed := true; - end; - end; - -begin - changed := false; done := false; - - while not done do - begin - writeln(filename, ' header:'); - showHeader(h); - writeln('Change H)eap size Change S)tack size eX)it'); - write('> '); - read(ch); - writeln; - case upcase(ch) of - 'S': changeStackSize; - 'H': changeHeapSize; - 'X': done := true; - else - writeln('invalid command'); - end; - end; - - if changed then - writeHeader(filename, h); -end; - -begin - if ParamCount > 0 then - filename := ParamStr(1) - else - begin - write('File name> '); - readln(filename); - end; - - readHeader(filename, h); - - if h.magic <> ProgramMagic then - writeln('invalid magic value ', h.magic) - else - modifyHeader(filename, h); -end. diff --git a/progs/dumpdir.pas b/progs/dumpdir.pas index 7411cae..584e812 100644 --- a/progs/dumpdir.pas +++ b/progs/dumpdir.pas @@ -14,8 +14,8 @@ var dirs:DirectorySlot; error:integer; begin lastSlot := volumeTable[volid].part.dirSize - 1; - openvolumeid(volid, error); (* we just ignore error here because - we should always have enough heap space *) + openvolumeid(volid); + for i := 0 to lastSlot do begin getdirslot(volid, i, dirs, error); diff --git a/progs/reclaim.pas b/progs/reclaim.pas index fed0e90..9983501 100644 --- a/progs/reclaim.pas +++ b/progs/reclaim.pas @@ -123,8 +123,7 @@ begin freeAreaCount := 0; lastUsed := 0; - openvolumeid(volid, error); - (* ignoring theoretically possible out-of-heap-error *) + openvolumeid(volid); i := 0; endSlot := volumeTable[volid].part.dirSize - 1; @@ -309,7 +308,7 @@ begin writeln('Volume ', volname, ' not found.') else begin - openvolumeid(volid, error); + openvolumeid(volid); endSlot := volumeTable[volid].part.dirSize - 1; extentSize := volumeTable[volid].part.extentSize; diff --git a/progs/recover.pas b/progs/recover.pas index b2303b2..cca6204 100644 --- a/progs/recover.pas +++ b/progs/recover.pas @@ -102,8 +102,8 @@ begin count := PageMargin; lastSlot := volumeTable[volid].part.dirSize - 1; - openvolumeid(volid, error); - (* ignoring theoretically possible out-of-heap-space error *) + openvolumeid(volid); + for i := 0 to lastSlot do begin getdirslot(volid, i, dirs, error); diff --git a/progs/shell.pas b/progs/shell.pas index 84920d6..6423b3f 100644 --- a/progs/shell.pas +++ b/progs/shell.pas @@ -149,7 +149,7 @@ begin count := PageMargin; writeln('reading directory of ', DefaultVolume); - openvolumeid(volid, error); + openvolumeid(volid); readdirfirst(volid, index, dirs, error); while index > 0 do begin diff --git a/progs/xfer.pas b/progs/xfer.pas index 0d871d2..7a4a389 100644 --- a/progs/xfer.pas +++ b/progs/xfer.pas @@ -226,7 +226,6 @@ begin if not invalid then begin open(xferFile, filename, ModeOverwrite); - blockNo := 0; done := false; repeat serReadBlock(ok); @@ -399,7 +398,7 @@ begin writeln('Volume ', DefaultVolume, ' not found.') else begin - openvolumeid(volid, error); + openvolumeid(volid); readdirfirst(volid, index, dirs, error); while (index > 0) and (error = 0) do begin diff --git a/rogue b/rogue index 73936b4..b0cfc83 160000 --- a/rogue +++ b/rogue @@ -1 +1 @@ -Subproject commit 73936b4167bad01642675252e53a096d80fa6b35 +Subproject commit b0cfc8334349d51f2610b24c023b6498be3fb17b diff --git a/tridoracpu/tridoracpu.srcs/Arty-A7-35-Master.xdc b/tridoracpu/tridoracpu.srcs/Arty-A7-35-Master.xdc index d2c3160..7c62767 100644 --- a/tridoracpu/tridoracpu.srcs/Arty-A7-35-Master.xdc +++ b/tridoracpu/tridoracpu.srcs/Arty-A7-35-Master.xdc @@ -8,8 +8,8 @@ set_property -dict {PACKAGE_PIN E3 IOSTANDARD LVCMOS33} [get_ports clk] create_clock -period 10.000 -name sys_clk_pin -waveform {0.000 5.000} -add [get_ports clk] ## Switches -#set_property -dict {PACKAGE_PIN A8 IOSTANDARD LVCMOS33} [get_ports sw0] -#set_property -dict {PACKAGE_PIN C11 IOSTANDARD LVCMOS33} [get_ports sw1] +set_property -dict {PACKAGE_PIN A8 IOSTANDARD LVCMOS33} [get_ports sw0] +set_property -dict {PACKAGE_PIN C11 IOSTANDARD LVCMOS33} [get_ports sw1] #set_property -dict { PACKAGE_PIN C10 IOSTANDARD LVCMOS33 } [get_ports { sw[2] }]; #IO_L13N_T2_MRCC_16 Sch=sw[2] #set_property -dict { PACKAGE_PIN A10 IOSTANDARD LVCMOS33 } [get_ports { sw[3] }]; #IO_L14P_T2_SRCC_16 Sch=sw[3] @@ -34,7 +34,7 @@ set_property -dict {PACKAGE_PIN T9 IOSTANDARD LVCMOS33} [get_ports led2] set_property -dict {PACKAGE_PIN T10 IOSTANDARD LVCMOS33} [get_ports led3] ## Buttons -#set_property -dict {PACKAGE_PIN D9 IOSTANDARD LVCMOS33} [get_ports btn0] +set_property -dict {PACKAGE_PIN D9 IOSTANDARD LVCMOS33} [get_ports btn0] #set_property -dict { PACKAGE_PIN C9 IOSTANDARD LVCMOS33 } [get_ports { btn1 }]; #IO_L11P_T1_SRCC_16 Sch=btn[1] #set_property -dict { PACKAGE_PIN B9 IOSTANDARD LVCMOS33 } [get_ports { btn[2] }]; #IO_L11N_T1_SRCC_16 Sch=btn[2] #set_property -dict { PACKAGE_PIN B8 IOSTANDARD LVCMOS33 } [get_ports { btn[3] }]; #IO_L12P_T1_MRCC_16 Sch=btn[3] @@ -70,10 +70,10 @@ set_property -dict {PACKAGE_PIN V14 IOSTANDARD LVCMOS33} [get_ports VGA_VS_O] #set_property -dict { PACKAGE_PIN U13 IOSTANDARD LVCMOS33 } [get_ports { jc[7] }]; #IO_L23N_T3_A02_D18_14 Sch=jc_n[4] ## Pmod Header JD -set_property -dict { PACKAGE_PIN D4 IOSTANDARD LVCMOS33 } [get_ports { amp2_ain }]; #IO_L11N_T1_SRCC_35 Sch=jd[1] -set_property -dict { PACKAGE_PIN D3 IOSTANDARD LVCMOS33 } [get_ports { amp2_gain }]; #IO_L12N_T1_MRCC_35 Sch=jd[2] +#set_property -dict { PACKAGE_PIN D4 IOSTANDARD LVCMOS33 } [get_ports { jd[0] }]; #IO_L11N_T1_SRCC_35 Sch=jd[1] +#set_property -dict { PACKAGE_PIN D3 IOSTANDARD LVCMOS33 } [get_ports { jd[1] }]; #IO_L12N_T1_MRCC_35 Sch=jd[2] #set_property -dict { PACKAGE_PIN F4 IOSTANDARD LVCMOS33 } [get_ports { jd[2] }]; #IO_L13P_T2_MRCC_35 Sch=jd[3] -set_property -dict { PACKAGE_PIN F3 IOSTANDARD LVCMOS33 } [get_ports { amp2_shutdown_n }]; #IO_L13N_T2_MRCC_35 Sch=jd[4] +#set_property -dict { PACKAGE_PIN F3 IOSTANDARD LVCMOS33 } [get_ports { jd[3] }]; #IO_L13N_T2_MRCC_35 Sch=jd[4] #set_property -dict { PACKAGE_PIN E2 IOSTANDARD LVCMOS33 } [get_ports { jd[4] }]; #IO_L14P_T2_SRCC_35 Sch=jd[7] #set_property -dict { PACKAGE_PIN D2 IOSTANDARD LVCMOS33 } [get_ports { jd[5] }]; #IO_L14N_T2_SRCC_35 Sch=jd[8] #set_property -dict { PACKAGE_PIN H2 IOSTANDARD LVCMOS33 } [get_ports { jd[6] }]; #IO_L15P_T2_DQS_35 Sch=jd[9] diff --git a/tridoracpu/tridoracpu.srcs/dram_bridge.v b/tridoracpu/tridoracpu.srcs/dram_bridge.v index 9bd2a92..c3f948a 100644 --- a/tridoracpu/tridoracpu.srcs/dram_bridge.v +++ b/tridoracpu/tridoracpu.srcs/dram_bridge.v @@ -107,14 +107,8 @@ module dram_bridge #(ADDR_WIDTH = 32, WIDTH = 32) ); (*KEEP*) reg [DRAM_DATA_WIDTH-1:0] ins_cache; - (*KEEP*) reg [DRAM_ADDR_WIDTH-1:4] icached_addr; - (*KEEP*) wire icache_hit = mem_read_enable && mem_read_ins && (icached_addr == mem_addr[DRAM_ADDR_WIDTH-1:4]); - - (*KEEP*) reg [DRAM_DATA_WIDTH-1:0] d_cache; - (*KEEP*) reg [DRAM_ADDR_WIDTH-1:4] dcached_addr; - (*KEEP*) wire dcache_hit = mem_read_enable && !mem_read_ins && (dcached_addr == mem_addr[DRAM_ADDR_WIDTH-1:4]); - - wire cache_hit = icache_hit | dcache_hit; + (*KEEP*) reg [DRAM_ADDR_WIDTH-1:4] cached_addr; + (*KEEP*) wire cache_hit = mem_read_enable && mem_read_ins && (cached_addr == mem_addr[DRAM_ADDR_WIDTH-1:4]); reg [WIDTH-1:0] read_buf; reg read_inprogress = 0; @@ -131,32 +125,25 @@ module dram_bridge #(ADDR_WIDTH = 32, WIDTH = 32) wire [1:0] word_sel = mem_addr[3:2]; wire [WIDTH-1:0] read_word = - word_sel == 2'b11 ? app_rd_data[31:0] : - word_sel == 2'b10 ? app_rd_data[63:32] : - word_sel == 2'b01 ? app_rd_data[95:64] : + word_sel == 3'b11 ? app_rd_data[31:0] : + word_sel == 3'b10 ? app_rd_data[63:32] : + word_sel == 3'b01 ? app_rd_data[95:64] : app_rd_data[127:96]; - wire [WIDTH-1:0] read_icached_word = - word_sel == 2'b11 ? ins_cache[31:0] : - word_sel == 2'b10 ? ins_cache[63:32] : - word_sel == 2'b01 ? ins_cache[95:64] : + wire [WIDTH-1:0] read_cached_word = + word_sel == 3'b11 ? ins_cache[31:0] : + word_sel == 3'b10 ? ins_cache[63:32] : + word_sel == 3'b01 ? ins_cache[95:64] : ins_cache[127:96]; - wire [WIDTH-1:0] read_dcached_word = - word_sel == 2'b11 ? d_cache[31:0] : - word_sel == 2'b10 ? d_cache[63:32] : - word_sel == 2'b01 ? d_cache[95:64] : - d_cache[127:96]; - - (*KEEP*) assign mem_read_data = icache_hit ? read_icached_word : - dcache_hit ? read_dcached_word : + (*KEEP*) assign mem_read_data = cache_hit ? read_cached_word : app_rd_data_valid ? read_word : read_buf; // set the write mask according to the lower bits of the address // (ignoring bit 0) - assign app_wdf_mask = word_sel == 2'b11 ? 16'b1111111111110000 : - word_sel == 2'b10 ? 16'b1111111100001111 : - word_sel == 2'b01 ? 16'b1111000011111111 : + assign app_wdf_mask = word_sel == 3'b11 ? 16'b1111111111110000 : + word_sel == 3'b10 ? 16'b1111111100001111 : + word_sel == 3'b01 ? 16'b1111000011111111 : 16'b0000111111111111 ; wire write_ready = mem_write_enable & app_wdf_rdy & app_rdy; @@ -173,58 +160,25 @@ module dram_bridge #(ADDR_WIDTH = 32, WIDTH = 32) assign app_cmd = dram_read_enable ? CMD_READ : CMD_WRITE; - /* set instruction cache */ always @(posedge dram_front_clk) begin if(dram_read_enable && mem_read_ins && app_rd_data_valid) begin ins_cache <= app_rd_data; - icached_addr <= mem_addr[DRAM_ADDR_WIDTH-1:4]; + cached_addr <= mem_addr[DRAM_ADDR_WIDTH-1:4]; end end - /* set data cache */ - always @(posedge dram_front_clk) - begin - if(dram_read_enable && !mem_read_ins && app_rd_data_valid) - begin - d_cache <= app_rd_data; - dcached_addr <= mem_addr[DRAM_ADDR_WIDTH-1:4]; - end - - /* write-through cache - invalidate on write */ - /* invalidate data cache on write */ -// if(mem_write_enable && dcached_addr == mem_addr[DRAM_ADDR_WIDTH-1:4]) -// dcached_addr <= {DRAM_ADDR_WIDTH-4{1'b1}}; - - /* write-back cache - update cache on write */ - // write back to data cache on mem_write - if(mem_write_enable && dcached_addr == mem_addr[DRAM_ADDR_WIDTH-1:4]) - begin - case(word_sel) - 2'b11: d_cache[31:0] <= mem_write_data; - 2'b10: d_cache[63:32] <= mem_write_data; - 2'b01: d_cache[95:64] <= mem_write_data; - 2'b00: d_cache[127:96] <= mem_write_data; - endcase - end - end - - /* transfer read data, either from cache or from DRAM */ always @(posedge dram_front_clk) begin if(dram_read_enable & ~read_inprogress & app_rdy) read_inprogress <= 1; if(read_inprogress & app_rd_data_valid) read_inprogress <= 0; - if(dram_read_enable & app_rd_data_valid) read_buf <= mem_read_data; else - if (mem_read_enable & icache_hit) - read_buf <= read_icached_word; - else - if (mem_read_enable & dcache_hit) - read_buf <= read_dcached_word; + if (mem_read_enable & cache_hit) + read_buf <= read_cached_word; end endmodule diff --git a/tridoracpu/tridoracpu.srcs/irqctrl.v b/tridoracpu/tridoracpu.srcs/irqctrl.v index b71df60..1a079bf 100644 --- a/tridoracpu/tridoracpu.srcs/irqctrl.v +++ b/tridoracpu/tridoracpu.srcs/irqctrl.v @@ -1,6 +1,6 @@ `timescale 1ns / 1ps -module irqctrl #(IRQ_LINES = 3, IRQ_DELAY_WIDTH = 4) ( +module irqctrl #(IRQ_LINES = 2, IRQ_DELAY_WIDTH = 4) ( input wire clk, input wire [IRQ_LINES-1:0] irq_in, input wire cs, diff --git a/tridoracpu/tridoracpu.srcs/mem.v b/tridoracpu/tridoracpu.srcs/mem.v index 2fe1b5f..2928a7d 100644 --- a/tridoracpu/tridoracpu.srcs/mem.v +++ b/tridoracpu/tridoracpu.srcs/mem.v @@ -91,10 +91,8 @@ module mem #(parameter ADDR_WIDTH = 32, // RAM1 $1000 - $FFFF 60K // RAM2 $10000 - $FFFFFFFF ~4GB - localparam RAM1_ADDR_WIDTH = 16; - wire ram_cs = addr[ADDR_WIDTH-1:12] != { {(ADDR_WIDTH-12){1'b0}}}; - wire ram1_cs = ram_cs && (addr[ADDR_WIDTH-1:RAM1_ADDR_WIDTH] == { {(ADDR_WIDTH-RAM1_ADDR_WIDTH){1'b0}}}); + wire ram1_cs = ram_cs && (addr[ADDR_WIDTH-1:16] == { {(ADDR_WIDTH-16){1'b0}}}); wire ram2_cs = ram_cs && !ram1_cs; wire rom_cs = !ram_cs && addr[11] == 1'b0; wire io_cs = !ram_cs && addr[11] == 1'b1; @@ -118,10 +116,10 @@ module mem #(parameter ADDR_WIDTH = 32, // test reg [1:0] wait_state; - ram32 #(.ADDR_WIDTH(RAM1_ADDR_WIDTH)) ram0 // 64KB RAM + ram32 #(.ADDR_WIDTH(16)) ram0 // 64KB RAM ( .clk(clk), - .addr(addr[RAM1_ADDR_WIDTH-1:0]), + .addr(addr[15:0]), .data_out(ram_out), .read_enable(ram_read), .data_in(data_in), diff --git a/tridoracpu/tridoracpu.srcs/stackcpu.v b/tridoracpu/tridoracpu.srcs/stackcpu.v index 1d929f7..33b58ec 100644 --- a/tridoracpu/tridoracpu.srcs/stackcpu.v +++ b/tridoracpu/tridoracpu.srcs/stackcpu.v @@ -16,11 +16,11 @@ module stackcpu #(parameter ADDR_WIDTH = 32, WIDTH = 32, output wire write_enable, input wire mem_wait, - output wire debug1, - output wire debug2, - output wire debug3 + output wire led1, + output wire led2, + output wire led3 ); - + localparam EVAL_STACK_INDEX_WIDTH = 6; wire reset = !rst; @@ -90,6 +90,7 @@ module stackcpu #(parameter ADDR_WIDTH = 32, WIDTH = 32, wire mem_write; wire x_is_zero; + // wire [WIDTH-1:0] y_plus_operand = Y + operand; wire x_equals_y = X == Y; wire y_lessthan_x = $signed(Y) < $signed(X); @@ -104,10 +105,16 @@ module stackcpu #(parameter ADDR_WIDTH = 32, WIDTH = 32, assign write_enable = mem_write_enable; // debug output ------------------------------------------------------------------------------------ - assign debug1 = reset; - assign debug2 = ins_loadc; - assign debug3 = ins_branch; - + assign led1 = reset; + assign led2 = ins_loadc; + assign led3 = ins_branch; +// assign debug_out1 = { mem_read_enable, mem_write_enable, x_is_zero, +// ins_branch, ins_aluop, y_lessthan_x, x_equals_y, {7{1'b0}}, seq_state}; +// assign debug_out2 = data_in; +// assign debug_out3 = nX; +// assign debug_out4 = nPC; +// assign debug_out5 = ins; +// assign debug_out6 = IV; //-------------------------------------------------------------------------------------------------- // instruction decoding diff --git a/tridoracpu/tridoracpu.srcs/tdraudio.v b/tridoracpu/tridoracpu.srcs/tdraudio.v deleted file mode 100644 index 1629e31..0000000 --- a/tridoracpu/tridoracpu.srcs/tdraudio.v +++ /dev/null @@ -1,270 +0,0 @@ -`timescale 1ns / 1ps - -// waveform generator module (PCM) -module wavegen #(DATA_WIDTH=32, CLOCK_DIV_WIDTH=22, - AMP_WIDTH=16, AMP_BIAS=32768) ( - input wire clk, - input wire reset, - input wire [1:0] reg_sel, - output wire [DATA_WIDTH-1:0] rd_data, - input wire [AMP_WIDTH-1:0] wr_data, - input wire rd_en, - input wire wr_en, - - output wire [AMP_WIDTH-1:0] amp_val, - output wire running, - output wire irq - ); - - localparam TDRAU_REG_CTL = 0; /* control register */ - localparam TDRAU_REG_CLK = 1; /* clock divider register */ - localparam TDRAU_REG_AMP = 2; /* amplitude (volume) register */ - - /* avoid warning about unconnected port */ - (* keep="soft" *) wire _unused = rd_en; - - reg channel_enable; - reg [CLOCK_DIV_WIDTH-1:0] clock_div; - reg [CLOCK_DIV_WIDTH-1:0] div_count; - reg amp_phase; - reg [AMP_WIDTH-1:0] amp_out; - - - wire fifo_wr_en; - wire fifo_rd_en, fifo_full, fifo_empty; - wire [AMP_WIDTH-1:0] fifo_rd_data; - - fifo #(.ADDR_WIDTH(4), .DATA_WIDTH(16)) sample_buf( - clk, reset, - fifo_wr_en, fifo_rd_en, - wr_data[AMP_WIDTH-1:0], fifo_rd_data, - fifo_full, - fifo_empty - ); - - assign fifo_rd_en = (div_count == 0) && channel_enable && ~fifo_empty; - assign fifo_wr_en = wr_en && (reg_sel == TDRAU_REG_AMP); - - reg irq_buf, irq_enable; - assign irq = channel_enable && irq_buf; - - reg [DATA_WIDTH-1:0] rd_data_buf; - assign rd_data = rd_data_buf; - - assign amp_val = amp_out; - assign running = channel_enable; - - wire ctl_reg_write = wr_en && (reg_sel == TDRAU_REG_CTL); - - /* update read data buffer */ - always @(posedge clk) - begin - rd_data_buf <= {{DATA_WIDTH-8{1'b0}}, - {3{1'b0}}, irq_enable, fifo_full, fifo_empty, amp_phase, channel_enable}; - end - - /* irq signal to interrupt controller */ - always @(posedge clk) - begin - if(reset) - irq_buf <= 0; - else - if(fifo_empty && irq_enable) - irq_buf <= 1; - else - irq_buf <= 0; - end - - /* interrupt enable flag */ - always @(posedge clk) - begin - if(reset) - irq_enable <= 0; - else - if(ctl_reg_write) - irq_enable <= wr_data[4]; - else - if(irq_buf) - irq_enable <= 0; // disable interrupts after an interrupt - end - - /* channel enable flag */ - always @(posedge clk) - begin - if(reset) - channel_enable <= 0; - else if (ctl_reg_write) - channel_enable <= wr_data[0]; - end - - /* clock divider register */ - always @(posedge clk) - begin - if(reset) - clock_div <= 0; - else - if (wr_en && (reg_sel == TDRAU_REG_CLK)) - clock_div <= wr_data; - end - - /* divider counter */ - always @(posedge clk) - begin - if(channel_enable) - begin - if(div_count == 0) // reset counter if it reaches zero - div_count <= clock_div; - else - div_count <= div_count - 1; // else just decrement it - end - else - if (wr_en && (reg_sel == TDRAU_REG_CLK)) // when setting divider, - div_count <= 1; // start cycle on next clock tick - end - - /* amplitude out */ - always @(posedge clk) - begin - if (reset) - begin - amp_out <= AMP_BIAS; - amp_phase <= 1; - end - else - if (channel_enable) - begin - if (div_count == 0) // invert amplitude on clock tick - begin - amp_out <= fifo_rd_data; - amp_phase <= ~amp_phase; - end - end - else - amp_out <= AMP_BIAS; - - // reset phase bit when enabling the channel - if (ctl_reg_write && wr_data[0] && ~channel_enable) - // when channel is being enabled, phase will be flipped on next tick - // because div_count will become zero - amp_phase <= 1; - end -endmodule - -module tdraudio #(DATA_WIDTH=32) ( - input wire clk, - input wire reset, - input wire [6:0] io_addr, - output wire [DATA_WIDTH-1:0] rd_data, - input wire [DATA_WIDTH-1:0] wr_data, - input wire rd_en, - input wire wr_en, - output wire irq_out, - output wire pdm_out, - output wire gain_sel, - output wire shutdown_n - ); - - localparam CLOCK_DIV_WIDTH = 22; - localparam AMP_WIDTH = 16; - localparam AMP_BIAS = 32768; - localparam DAC_WIDTH = 18; - - /* avoid warning about unconnected port */ - (* keep="soft" *) wire [DATA_WIDTH-1:AMP_WIDTH] _unused = wr_data[DATA_WIDTH-1:AMP_WIDTH]; - - wire [4:0] chan_sel = io_addr[6:2]; - wire [1:0] reg_sel = io_addr[1:0]; - - wire [AMP_WIDTH-1:0] amp_wr_data = wr_data[AMP_WIDTH-1:0]; - - wire [AMP_WIDTH-1:0] chan0_amp; - wire [DATA_WIDTH-1:0] chan0_rd_data; - wire chan0_running; - wire chan0_irq; - wire chan0_sel = chan_sel == 5'd0; - wire chan0_rd_en = chan0_sel && rd_en; - wire chan0_wr_en = chan0_sel && wr_en; - - wire [AMP_WIDTH-1:0] chan1_amp; - wire [DATA_WIDTH-1:0] chan1_rd_data; - wire chan1_running; - wire chan1_irq; - wire chan1_sel = chan_sel == 5'd1; - wire chan1_rd_en = chan1_sel && rd_en; - wire chan1_wr_en = chan1_sel && wr_en; - - wire [AMP_WIDTH-1:0] chan2_amp; - wire [DATA_WIDTH-1:0] chan2_rd_data; - wire chan2_running; - wire chan2_irq; - wire chan2_sel = chan_sel == 5'd2; - wire chan2_rd_en = chan2_sel && rd_en; - wire chan2_wr_en = chan2_sel && wr_en; - - wire [AMP_WIDTH-1:0] chan3_amp; - wire [DATA_WIDTH-1:0] chan3_rd_data; - wire chan3_running; - wire chan3_irq; - wire chan3_sel = chan_sel == 5'd3; - wire chan3_rd_en = chan3_sel && rd_en; - wire chan3_wr_en = chan3_sel && wr_en; - - wire running = chan0_running || chan1_running || chan2_running || chan3_running; - - assign rd_data = chan0_sel ? chan0_rd_data : - chan1_sel ? chan1_rd_data : - chan2_sel ? chan2_rd_data : - chan3_sel ? chan3_rd_data : - {DATA_WIDTH{1'b1}}; - - wavegen chan0(clk, reset, reg_sel, - chan0_rd_data, amp_wr_data, - chan0_rd_en, chan0_wr_en, - chan0_amp, - chan0_running, chan0_irq); - - wavegen chan1(clk, reset, reg_sel, - chan1_rd_data, amp_wr_data, - chan1_rd_en, chan1_wr_en, - chan1_amp, - chan1_running, chan1_irq); - - wavegen chan2(clk, reset, reg_sel, - chan2_rd_data, amp_wr_data, - chan2_rd_en, chan2_wr_en, - chan2_amp, - chan2_irq, chan2_running); - - wavegen chan3(clk, reset, reg_sel, - chan3_rd_data, amp_wr_data, - chan3_rd_en, chan3_wr_en, - chan3_amp, - chan3_running, chan3_irq); - - reg [DAC_WIDTH:0] deltasigma_acc; // one extra bit - wire [DAC_WIDTH:0] amp_sum = chan0_amp + chan1_amp + chan2_amp + chan3_amp; // also one overflow bit here - assign gain_sel = 1; // gain select: 0 -> 12dB, 1 -> 6dB - - // assign shutdown_n = running; - assign shutdown_n = 1; /* don't enable shutdown mode, it creates a mains hum */ - - reg irq_out_buf; - assign irq_out = irq_out_buf; - - always @(posedge clk) irq_out_buf <= chan0_irq || chan1_irq || chan2_irq || chan3_irq; - - /* delta-sigma DAC */ - always @(posedge clk) - begin - if(reset) - deltasigma_acc <= 0; - else -// if (running) - deltasigma_acc <= deltasigma_acc[DAC_WIDTH-1:0] + amp_sum; -// else -// deltasigma_acc <= deltasigma_acc[DAC_WIDTH-1:0] + (4*AMP_BIAS); - end - - /* 1-bit audio output */ - assign pdm_out = deltasigma_acc[DAC_WIDTH]; -endmodule diff --git a/tridoracpu/tridoracpu.srcs/top.v b/tridoracpu/tridoracpu.srcs/top.v index a4533d2..00066fe 100644 --- a/tridoracpu/tridoracpu.srcs/top.v +++ b/tridoracpu/tridoracpu.srcs/top.v @@ -10,11 +10,13 @@ //`define clock clk_1hz `define ENABLE_VGAFB `define ENABLE_MICROSD -`define ENABLE_TDRAUDIO module top( input wire clk, input wire rst, + input wire btn0, + input wire sw0, + input wire sw1, output wire led0, output wire led1, output wire led2, @@ -58,13 +60,6 @@ module top( output wire sd_sck, input wire sd_cd `endif - -`ifdef ENABLE_TDRAUDIO - , - output wire amp2_ain, - output wire amp2_gain, - output wire amp2_shutdown_n -`endif ); reg clk_1hz; @@ -225,44 +220,11 @@ module top( assign uart_tx_data = mem_write_data[7:0]; assign uart_rd_data = { {WIDTH-10{1'b1}}, uart_rx_avail, uart_tx_busy, uart_rx_data }; - wire audio_irq; - - buart #(.CLKFREQ(`clkfreq)) uart0(`clock, rst, - uart_baud, - uart_txd_in, uart_rxd_out, - uart_rx_clear, uart_tx_en, - uart_rx_avail, uart_tx_busy, - uart_tx_data, uart_rx_data); - - // audio controller -`ifdef ENABLE_TDRAUDIO - wire [WIDTH-1:0] tdraudio_wr_data; - wire [WIDTH-1:0] tdraudio_rd_data; - wire tdraudio_rd_en, tdraudio_wr_en; - wire tdraudio_irq; - - wire tdraudio_cs_en = io_enable && (io_slot == 4); - assign tdraudio_rd_en = tdraudio_cs_en && mem_read_enable; - assign tdraudio_wr_en = tdraudio_cs_en && mem_write_enable; - assign tdraudio_wr_data = mem_write_data; - - tdraudio tdraudio0(`clock, ~rst, - mem_addr[6:0], - tdraudio_rd_data, - tdraudio_wr_data, - tdraudio_rd_en, - tdraudio_wr_en, - tdraudio_irq, - amp2_ain, amp2_gain, amp2_shutdown_n); - assign audio_irq = tdraudio_irq; -`endif - - // interrupt controller reg timer_tick; reg[23:0] tick_count; - wire [2:0] irq_in = { audio_irq, timer_tick, uart_rx_avail }; - wire [2:0] irqc_rd_data0; - wire [WIDTH-1:0] irqc_rd_data = { tick_count, 5'b0, irqc_rd_data0 }; + wire [1:0] irq_in = { timer_tick, uart_rx_avail }; + wire [1:0] irqc_rd_data0; + wire [WIDTH-1:0] irqc_rd_data = { tick_count, 6'b0, irqc_rd_data0 }; wire irqc_seten = mem_write_data[7]; wire irqc_cs = io_enable && (io_slot == 3); @@ -274,11 +236,16 @@ module top( (io_slot == 2) ? fb_rd_data : `endif (io_slot == 3) ? irqc_rd_data: - `ifdef ENABLE_TDRAUDIO - (io_slot == 4) ? tdraudio_rd_data: - `endif + -1; + buart #(.CLKFREQ(`clkfreq)) uart0(`clock, rst, + uart_baud, + uart_txd_in, uart_rxd_out, + uart_rx_clear, uart_tx_en, + uart_rx_avail, uart_tx_busy, + uart_tx_data, uart_rx_data); + // CPU ----------------------------------------------------------------- stackcpu cpu0(.clk(`clock), .rst(rst), .irq(irq), .addr(mem_addr), @@ -286,7 +253,7 @@ module top( .read_ins(dram_read_ins), .data_out(mem_write_data), .write_enable(mem_write_enable), .mem_wait(mem_wait), - .debug1(led1), .debug2(led2), .debug3(led3)); + .led1(led1), .led2(led2), .led3(led3)); // Interrupt Controller irqctrl irqctrl0(`clock, irq_in, irqc_cs, mem_write_enable, diff --git a/tridoracpu/tridoracpu.xpr b/tridoracpu/tridoracpu.xpr index a9dc20f..b0ba2bb 100644 --- a/tridoracpu/tridoracpu.xpr +++ b/tridoracpu/tridoracpu.xpr @@ -111,7 +111,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -173,14 +173,14 @@ - + - + @@ -205,13 +205,6 @@ - - - - - - -