From ab78a6761f011a9bdcaef07d151abb5ccef4204f Mon Sep 17 00:00:00 2001 From: lonkaars Date: Fri, 10 Feb 2023 14:13:22 +0100 Subject: PPU resolution change --- assets/ppu-level-1.svg | 2 +- assets/ppu-level-2.svg | 2 +- assets/ppu-level-3.svg | 2 +- docs/ppu.drawio | 2 +- docs/research.md | 32 +++++++++++++++++++++++--------- 5 files changed, 27 insertions(+), 13 deletions(-) diff --git a/assets/ppu-level-1.svg b/assets/ppu-level-1.svg index e1ea30e..2770d7d 100644 --- a/assets/ppu-level-1.svg +++ b/assets/ppu-level-1.svg @@ -1,3 +1,3 @@ -
Basys3 FPGA
PPU
Basys3 FPGA...
Display output
(VGA)
Display output...
STM32F091RC
CPU
STM32F091RC...
VSYNC
VSYNC
HSYNC
HSYNC
VSYNC
VSYNC
HSYNC
HSYNC
RESET
RESET
VRAM-ADDR
VRAM-ADDR
VRAM-DATA
VRAM-DATA
VRAM-WEN
VRAM-WEN
G
G
B
B
R
R
Text is not SVG - cannot display
\ No newline at end of file +
Basys3 FPGA
PPU
Basys3 FPGA...
Display output
(VGA)
Display output...
STM32F091RC
CPU
STM32F091RC...
VSYNC
VSYNC
HSYNC
HSYNC
RESET
RESET
VRAM-ADDR
VRAM-ADDR
VRAM-DATA
VRAM-DATA
VRAM-WEN
VRAM-WEN
G
G
B
B
R
R
NVSYNC
NVSYNC
NHSYNC
NHSYNC
TVSYNC
TVSYNC
THSYNC
THSYNC
Text is not SVG - cannot display
\ No newline at end of file diff --git a/assets/ppu-level-2.svg b/assets/ppu-level-2.svg index 8844a81..d3305ac 100644 --- a/assets/ppu-level-2.svg +++ b/assets/ppu-level-2.svg @@ -1,3 +1,3 @@ -
pipeline stage 1-2
pipeline s...
pipeline stage 5
pipeline s...
pipeline stage 3-4
pipeline s...
sprite info
sprite info
TMM
TMM
Background sprite info
Background sp...
sprite info
sprite info
TMM
TMM
Foreground sprite info
Foreground sp...
global palette index
global palette index
Compositor
Compositor
VGA signal
VGA signal
VGA signal generator
VGA signal ge...
rgb value
rgb value
PAL
PAL
Palette lookup
Palette lookup
BAM
BAM
BAX
BAX
Sprite render
Sprite render
pixel data
pixel data
FAM
FAM
Sprite render
Sprite render
TMM
TMM
Tilemap memory
Tilemap memory
BAM
BAM
Background attribute memory
Background attribute...
screen position
screen position
PPU RAM bus
PPU RAM bus
PPU RAM bus
PPU RAM bus
Text is not SVG - cannot display
\ No newline at end of file +
pipeline stage 1-2
pipeline s...
pipeline stage 5
pipeline s...
pipeline stage 3-4
pipeline s...
sprite info
sprite info
TMM
TMM
Background sprite info
Background sp...
sprite info
sprite info
TMM
TMM
Foreground sprite info
Foreground sp...
global palette index
global palette index
Compositor
Compositor
VGA signal
VGA signal
tiny VGA signal generator
tiny VGA sign...
rgb value
rgb value
PAL
PAL
Palette lookup
Palette lookup
BAM
BAM
BAX
BAX
Sprite render
Sprite render
pixel data
pixel data
FAM
FAM
Sprite render
Sprite render
TMM
TMM
Tilemap memory
Tilemap memory
BAM
BAM
Background attribute memory
Background attribute...
screen position
screen position
PPU RAM bus
PPU RAM bus
PPU RAM bus
PPU RAM bus
native VGA signal generator
native VGA si...
VGA signal
VGA signal
Text is not SVG - cannot display
\ No newline at end of file diff --git a/assets/ppu-level-3.svg b/assets/ppu-level-3.svg index ed755f3..e63c6f1 100644 --- a/assets/ppu-level-3.svg +++ b/assets/ppu-level-3.svg @@ -1,3 +1,3 @@ -
VGA signal generator
VGA signal generator
CLK
CLK
R
R
G
G
B
B
R
R
G
G
B
B
X
X
Y
Y
VSYNC
VSYNC
HSYNC
HSYNC
100MHz
100MHz
CLK
CLK
Outputs
Outputs
R
R
G
G
B
B
VSYNC
VSYNC
HSYNC
HSYNC
Palette lookup
Palette lookup
CLK
CLK
CIDX
CIDX
WEN
WEN
ADDR
ADDR
DATA
DATA
R
R
G
G
B
B
RESET
RESET
Address decoder
Address decoder
WEN
WEN
ADDR
ADDR
BAX
BAX
PAL
PAL
FAM
FAM
BAM
BAM
TMM
TMM
Pipeline clock edge generator
Pipeline clock edge generator
S5
S5
S4
S4
S3
S3
S2
S2
S1
S1
CLK
CLK
RESET
RESET
Compositor
Compositor
CIDX
CIDX
BGEN
BGEN
CIDX
CIDX
FG00HIT
FG00HIT
FG01HIT
FG01HIT
FG7AHIT
FG7AHIT
( - )
( - )
FG80HIT
FG80HIT
FG7AEN
FG7AEN
FG01EN
FG01EN
FG00EN
FG00EN
( - )
( - )
FG80EN
FG80EN
Tilemap memory
Tilemap memory
ADDR
ADDR
DATA
DATA
DATA
DATA
WEN
WEN
CLK
CLK
Background attribute memory
Background attribute memory
ADDR
ADDR
DATA
DATA
DATA
DATA
WEN
WEN
CLK
CLK
Foreground sprite
Foreground sprite
CLK
CLK
CIDX
CIDX
FETCH
FETCH
WEN-FAM
WEN-FAM
ADDR-FAM
ADDR-FAM
DATA-FAM
DATA-FAM
ADDR-TMM
ADDR-TMM
DATA-TMM
DATA-TMM
X
X
Y
Y
HIT
HIT
OE
OE
Background sprite
Background sprite
CLK
CLK
CIDX
CIDX
WEN-BAX
WEN-BAX
ADDR-BAX
ADDR-BAX
DATA-BAX
DATA-BAX
ADDR-BAM
ADDR-BAM
DATA-BAM
DATA-BAM
X
X
Y
Y
OE
OE
ADDR-TMM
ADDR-TMM
DATA-TMM
DATA-TMM
Inputs
Inputs
RESET
RESET
WEN
WEN
ADDR
ADDR
DATA
DATA
Text is not SVG - cannot display
\ No newline at end of file +
tiny VGA signal generator
tiny VGA signal generator
CLK
CLK
R
R
G
G
B
B
R
R
G
G
B
B
X
X
Y
Y
VSYNC
VSYNC
HSYNC
HSYNC
100MHz
100MHz
CLK
CLK
Palette lookup
Palette lookup
CLK
CLK
CIDX
CIDX
WEN
WEN
ADDR
ADDR
DATA
DATA
R
R
G
G
B
B
RESET
RESET
Address decoder
Address decoder
WEN
WEN
ADDR
ADDR
BAX
BAX
PAL
PAL
FAM
FAM
BAM
BAM
TMM
TMM
Pipeline clock edge generator
Pipeline clock edge generator
S5
S5
S4
S4
S3
S3
S2
S2
S1
S1
CLK
CLK
RESET
RESET
Compositor
Compositor
CIDX
CIDX
BGEN
BGEN
CIDX
CIDX
FG00HIT
FG00HIT
FG01HIT
FG01HIT
FG7AHIT
FG7AHIT
( - )
( - )
FG80HIT
FG80HIT
FG7AEN
FG7AEN
FG01EN
FG01EN
FG00EN
FG00EN
( - )
( - )
FG80EN
FG80EN
Tilemap memory
Tilemap memory
ADDR
ADDR
DATA
DATA
DATA
DATA
WEN
WEN
CLK
CLK
Background attribute memory
Background attribute memory
ADDR
ADDR
DATA
DATA
DATA
DATA
WEN
WEN
CLK
CLK
Foreground sprite
Foreground sprite
CLK
CLK
CIDX
CIDX
FETCH
FETCH
WEN-FAM
WEN-FAM
ADDR-FAM
ADDR-FAM
DATA-FAM
DATA-FAM
ADDR-TMM
ADDR-TMM
DATA-TMM
DATA-TMM
X
X
Y
Y
HIT
HIT
OE
OE
Background sprite
Background sprite
CLK
CLK
CIDX
CIDX
WEN-BAX
WEN-BAX
ADDR-BAX
ADDR-BAX
DATA-BAX
DATA-BAX
ADDR-BAM
ADDR-BAM
DATA-BAM
DATA-BAM
X
X
Y
Y
OE
OE
ADDR-TMM
ADDR-TMM
DATA-TMM
DATA-TMM
Inputs
Inputs
RESET
RESET
WEN
WEN
ADDR
ADDR
DATA
DATA
native VGA signal generator
native VGA signal generator
CLK
CLK
R
R
G
G
B
B
R
R
G
G
B
B
VSYNC
VSYNC
HSYNC
HSYNC
X
X
Y
Y
Outputs
Outputs
R
R
G
G
B
B
NVSYNC
NVSYNC
NHSYNC
NHSYNC
TVSYNC
TVSYNC
THSYNC
THSYNC
Text is not SVG - cannot display
\ No newline at end of file diff --git a/docs/ppu.drawio b/docs/ppu.drawio index 337bc1c..a9e20e8 100644 --- a/docs/ppu.drawio +++ b/docs/ppu.drawio @@ -1 +1 @@ -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 \ No newline at end of file +7Vtbd6o4FP41rjXz0C6uXh7x0nbOaR2X2ovnZRZKRHoi8UCsen79BEjkEgoyCtY19qGLbDaB7O/b3w4J1uTOcnvv6KvFEzIArEmCsa3J3ZokNYUm+e8ZdoFBaamBwXQsIzCJoWFk/QbUKFDr2jKAG3PECEFsreLGGbJtMMMxm+44aBN3myMYv+tKNwFnGM10yFtfLQMv6LBUIbQ/AMtcsDuLAj2z1JkzNbgL3UCbiEnu1eSOgxAOjpbbDoBe7FhcguvuPjm7fzAH2PiQC9TdXxi/4fFaHG8mEPXrPeHhhvbyocM1HXBbd3euTGx3g3utJtUh6bw9dciR6R0NBs90OHjHYuSgtW0A7zYC8dgsLAxGK33mnd0QUhDbAi8haYnk0CVnLNt8BHPvqW9UIbQNaRxjRtor1KcADpBrYQvZxDYjowYOOfEBHGwRvB4TDlOEMVoSBx1aZuoVGj2BkfeIfDhZbIg72EZMNLz3AC0BdnbEhZ2tU6gp12Xa3ITEERkbFlHSMEedktXcdx3iSQ4opAXglTh4u5a7grr30GiNV2vMI/zHy7325xXjTzCWpVyMm2VB/AHg6mn9t7j73h3eLUF/OjC+3YhNDitgEAmjTeTgBTKRrcNeaG3H0Qx9HpEXJx/Dd4DxjuqxvsYojjCwmVZLWXF10dqZgQyCylTSdccEOGOUrcDPG1kmSg6AOrY+4uKdFnP/Us1x/FRgDitk2diN9DzwDJEEV+PgK2pccQu5k4Pg/iH2+4EcRIfvj9rLcjKZvH3vtayt9nuK6q8soEewwf0J8Gzx36mxr3N+ZwRZrHl1mBhsZANmu7O8cfk+J2VPalCkr8EeOU4HUcihT7b/0fzJCmmkYozGT7J0J7TEYYcvFp3rdODzUtG6bTXyi8WtIFc5JWD1IoIwLxm2wXJ2BnXXtWZx0OII5wsMgFO/MxbqCAzQB94TjZV3/RyCLb11m0VJYZrBJuD1oAAlmpF65HvTtlxJfRLlAyVmG7t/hAhqyqyB2YrpEi8kYmLO0kiQKwgDvSpDkaTk5KeV6CiIE9dRYaVUEsqXV2iz/eNKGV7NHgfN5y7AtWRmFVPTVFooXK69jCb9DpdwRFFwQhexg36CDoLICSvnnBTNhCmRR0kxW1qG4adgmgwn6n5MYBMaLHBSnTnvO0YkFV4kP9HIsqbUKofawxW1HNTqZ0dNbPF1rOoXIbC18Bsri+R4EjnubqONXZHJb+p463xpyloDOPPkN/ne3MhW9Gz3o6e+qQGVlPMQiDz1njNewyfNrcqaIW/81m7fqoB4DfHhCQrvz78eNen1R/3Xc+PHPwfPiZQvQTypVeidPemeXFRNuh/jfeL1gHRSs9Xn/4kqNi9LFROv+M0cVcx0L4lA6lUVD1FF5UBVVL8G8YQ4k9Qc4gnJpahMd/EY73oFpKZTxcgMf9gb9cYc07/8DD+2NnbaOX5yN0tJWaAobTKftij1JXc10l9FhMuqQsnslguqgVxByor8VvXLUHu60brd4QXmrfedQEWJm77nXFrmHr8Ddc7MlS47c3PebnL8S8pcfk/Jz9yuNtaumZuZudXWXJFD45IyN2UCfkmZKxXMXKmKzOVXwnmKXPcKi+4Vigcy8Cx7hbJwK0T/6nHaCWrq6aI7iWLjqNuUtc+Yk4Q5/pXsM2Z94JKssK+9/rXAZhZYoaQCC/uwa74rgrs2Fs328tt8ODRTPrbl0DFJoFaHD3T/3bM+ZT0ImQHYf5yY9W5Q3reKAheB+xII6gRDKY2h6WTMhDyfofG1soq2THndaF/xiOFR6buzyH8vUsbaxkXicWoAUhfxiyn0wXKcIuYHK3QjhYBSWQSsc+Pvl/XB0nlImIl69STM2sKMglDW90cXCULJlTL16fhCeXZhSFsbOoUwZH3zERn/+PKFIQWmXJpKZ6xO/OxgfPnCcEIQTisMpBn+ODN4UQ9/4Sr3/gU=7Vzbdto6EP2aPNLlu+ExpE16VtI2bZL2vAosQI2xfGQ5QL/+SCCDJRljEwxOQx+68Gh8m9kzeySPcmFfTec3BMSTLziA4YVlBPML++OFZXm+zf7ngsVK4JhCMCYoWInMjeAB/YFCaAhpigKYSIoU45CiWBYOcRTBIZVkgBA8k9VGOJTvGoMx1AQPQxDq0l8ooJOVtOsaG/lniMaT7M6mIUamIFMWgmQCAjzLiexPF/YVwZiufk3nVzDktsvssjrvesvo+sEIjGiVE9yrUe/ls/Py59vty8JNQ/L5912nK7zxAsJUvHGMYhiiCPJHptw6lmF2LPEOdJEZBkbBJbcvO4ow07b7EzoN2ZHJfhKcRgHkNzbY0frN+UEAkslyhOslz5AOJ2IkBAMY3uMEUYQjJiMrs/ZfIKGIeeROGZ+iIOBP0wchGhedcCnkA0wpnrIBHIMhohyJLr+hbkFhVBhIoBD2vIF4CilZMIW5pD7bACPDxSSHiUxGYAgoepGBBQQ+x+uLr+93jxF7LssQkWPahnxKglMyhEIr7/jsxCwGsxO3XYgCMoa05EKZIh6NEijpsB85w2xES+zVwaFfBYfuGYWnRqHtHwiF2oWOi8KvZPGPFUVTf5gy/8zdFN4GHbcKCO2Oc4bhqWG4ZtXXwlC7UAuSoacnwyQmiHL0oWiEdfgxFz2IQ0zoBI9xBMJPG6mKwTzSNifcYRwLLP6GlC5ENQZSimVESxhmcUGogv6l7Brx117qbAVhwkEYjfvi+GO3DIkrH5cYzskqxKUPSxRdey9s7wva5iHj66nr8cuXPYDCXBvz0VEI58KpRwPPIMTD5wL06NmVSXLj+wMmw8FOwDhGRcDUgwh7LbDIKcQcMEkBggQObVcp5bpKzV9Pn/1YPcHR8ZpFag6vfTB8Hi+hxj1Xmu9kQM4mTPWBJRI+OmOzUBlvW9HBkxKcl3pTjFqObMbsMMd13QKu6xrb3S8ZtDZB6NF+JohKBFE13l3/byMIfaK/H0GcGChF/CRV0ZXAUVj9HxwbzXKBadbjgh3627ggYxJfPrtTsQA/GGHo+L3GBLaUMEx3L8JwmiKMzHk5641DPADh8kVDFqIr0wXs9d5cSngFHThVy7/uoUP+Ve7Mnjvnzis8jflqACYnB79aLR0T/eQ/3w2SHjCDb/b3+bfYmd3edUzNJH8zpt2qmK46B26WxixPSZU7aMx6lbr6jUTlyF6ZukyRezBbITqtMzpLJohndOa0u8dHpz7T/HlzyT3N5mm8fHh/0FUQKWO5d/v9Jn36+utyZNz1n4LO08/oV+cgyNUrckNGg2so/LllJbv2mtOW+2xdcyrXP+Gak45liiJuChnSxhhGkIA2llKOUa2U8hqbSLyvWqpbla2Kc8Op5ge+pSGdjAdrwdmDrfdgV18fv7+828Nzbfyecwx3tuR7jVI+2s4O7izXf3WJV2rUPNbWa0Ihxs9p3DoitK1qRNjYiprXe09ptPp3UqdVadTvadDuX761z+KHJ0WjqjfbMQm3leD3diTRUvVmcmiWeySg/fvGgNYAX1dtyGkpX5u75rrl+s1gzdU/hT1kX7+YiwLYvnmr6Z2arvUaJ0bz1VYFQMG74nL/0FwunN4xPoh5Z8NrsuqqqVlz2dQsCdKj9mTon/Gu31x10gBpFBSbZQ0bJ+aMXq3ipFS7bg+GWXHJ92DMozcmt4151M6LkzOP72k2O3fm7k4C3hurHB0lsHd1Y+3Qb6Zy9PRVxUcUwimLQ8uYwikWeD9lALtqm1pBAJvWUSNYrx3PiwjVFxG8dtC049Xi6XL1hsJTn9hJTfGAUoIG6ZJuWxqtBa1ejQVrYb+CbsJkSCCM+Itmu+VUo7F3pUocUYKf4RUOMdnEzoiFjSLKNtsNmQVZ8aP3sa+35RW5QnbWcsffxt/ZnQI4AmlID1Qdqe0sfoG/jAJ/qd2+h2tl1BfO7u+fmOAHT7HGIE1eh3HVIRQvFTBBf3BEQZYHA0TgUGylnMGEXugbKcVOhMdlKjY2gh/CSqU7E6q7yDF2RpRd4CD7EB4qm2WdHTSXHVLPP+YhWjK2dxdJ/olWNNpsX4tmsAKzVl4fXNPIjlma25QRLc2If0Obm9aqtqPQO2L3mroo5zXUvabex+3VWyxU9OsvFhb0x/U+9PL/5PupeWLvfTXscPPHZVbqm7/QY3/6Hw==7V1bU+LKFv41Vp3zwC7IFR5R8bK3dxz3+GShZBRFwsQ4Xn79TiRB6LXoTkj6QienatcZYjck/X1Zve69Ze48v+8Hg+nDsT/0xltGc/i+Ze5uGdH/HCv6v/jKx+xK23FnF+6D0XB2qfV9oT/69JKLzeTq62jovSwNDH1/HI6myxfv/MnEuwuXrg2CwH9bHvbLHy//6nRw74EL/bvBGF79dzQMH5KnsJvf1w+80f1D+sutZvKX50E6OLnw8jAY+m8Ll8zelrkT+H44+9fz+443jhcvXZfZvL0Vf53fWOBNwiwTLn853afG9HJ7587+bH2+XZzb44bRmX3Nn8H4NXni5G7Dj3QJ7gP/dbplbr+Egf/k7fhjP4j+MPEn0d+34V0kN/bHC0LvHcNocJt+8/cyRPzx/GcvDD6icemsdCkT6phu8vltAYjk0sMyBgn+Cfb386/+Xp7oH8kK4at1Mb092fn427vxHx73j//+O2j++myYYLHC0SS+46v9brxmo/vJIP6Se2/iBYMwWidyLaOlnAy9+Dea0eK9PYxCrz8d3MV/fYteoOjaQ/gc3dNuK17w6C+jyf2R9yt+sobd/L52kTzu7GK81qOIs91xdAfR1dCPv2k8uPXGZ/7LKBz58dW7CCIvWBh+RAy49cPQf44GDJLvmc9IfjW5bYg5nVskEyDiIhDtHXd2x9bL4fHj7fPtj5uTbuem02hBSHeO/gGwRfcfEthgL8Ov0XhMXEqXcvwFIkDqeTQcxj+CUmGZLMsYEDxoAroYXID6WJbOSyCVgNFbr2vuHrzZF0fnj4f9H5+928OfjblEYcqogo+bXUKlEglZBpMbVS2wDBf6EpXOBDZRy2YmDokNINmvIZEkO3CEHIDQdo0QAyFDqHQ3lJPu78uaSLIqlkhh3xYi64PZk3DjbR6WGitgkyTaoV3EQ7JvJgBSBHlTiCDfaEDEym1oOakptzGaGrxoCtWNn5qz1FwBmyS57QIArmsAZBrv0GpVU0xgfiduYqIFXRpX/euTHc2paq3ATpb5Dk2PgxoFyQLDAavvDe+9fvLRD8IH/96fDMa976vEQn2POfJjR/gXYI9eGH4k4aXBa+gvwxmtWPDxM5n/9eF68cPu+9Knj61VfvDktX7xX4M7j71LhYPg3kum3j7uvD78uN37afxpX/9+2fWdbXfuYIqXgIpU4I0H4eiPt3QbGDbJ1DN/FN3zXBYa9rIwNG0C3tmdJrO+Ee4GweBjYdg0HvBC+R0ypNOxF7+OOb7lNqnjG5ZZcIKxPCH6x+wZvwk9X/X1Oe5WgeNOVo5bgjhuieF4q0P8TpvOcXJ8q82irFFwguEI4Hiq4uhNcqMNWU6N3pTM8tXkXNqEy8AT6u064tnJiiefnVkgnmYV8Ex3dzaezobjaa0fJS8tY6fRJnaadItdyO/gFUZBF8WEcZRWs3l88AmWhk9iTokpOHiODysxh06VXIk5QoFLf4x7Xo5ChnkOWN6XIaHY6Z2/TNcuDtJ9+/j1+vz3xcfj5e+n/uRk3746Q9LhxEscY4VSLy1HEHEqnQ3G0aboRRfHvv+Urse6wocqCISKJJbwoZJG5aRAGPzVOimwIE6pAx2BiBdCBrI9HO7yCLVpBRGWr8jNkYvkK2bdHnI9be6sTZeTIoMzFW4H//ZO9CUqnQqKBH6Q3IXu7u5FjYpKGT9I5Hi3e9mtQVIpCwhRlSQLeTy6bwuV+ZXL3pzTQBUBX7n0zRwIyBDmJlTYNU/fzA8IL8GNClqoll70+r1LfXfXciwobB/hhlGrDeDY7BANntGXNUSTqha8EwUa7rLuYJFpgCUlCjRI9y0jGYYcbxk2QbFiYXxcTkDBnVXBK8/J65IrldHL65bwZnZOd/euJj8M85++ZR0Me51z12rAWFt3OAy8lwjt5tC784deAFZJ0wgTnTWFvbxlQIgL1/WjF/keObd/ilfBAip9kQJJrf1TdC6IN1/Q+4GY6O2eKgoKZ4sGv72SPR8lyI/s9U9k6mNp4gTp1bDd1acEis6EzETFUinKICpVv14MSHePakjEhMbwTRfKjr3ucQ2JGH8IDgn02W7XkIjaYXFIYC3n5XENiVBN1NStVIWabbjogsKVtNKzvguhg2RJZtVBS3TOEDVaAn0zOEbQsD8bTb3xaBJn4N2N/bunFEHxnfrUdNdYq2wPddw1Jmy1lZXq+R5ZVXML5zrUWvq23jvknAjSrS0cEaja960aETHGFn57cJPsw9qniiMiNPZsQidRH0rziiMi1JlpGhARWL9bVUTEQFCyP7kEBYdzPIpqYVW79kIxL4ABA1KVzBZSxl+G3p67vgQpzxsAul8gTftbqLbBrSIPknfHf57GJnbFzX43O5+FoIfHwmEZAKdSL4WUkxzIvBOoSJE80OW2vc8li0QrjISawS6iWFWvZDIHaJxfpI53dvpqG+fD/enZ9P1qfNPeaxRx6Od73NxGAOLVRzcCbq5Od/2loS/1+ksj5LltGAXd2282Dw6rpn27qwCTZBTZ0PceAdOqgVHMLHKwF8jt1jixcRKqoDjwffpf9LER/ff/zUMq3l+EYiXUg+8gCWz77XpTyoCT0Giku35TOF5KE2kLCVGiHKg8xnuA9iZq7qOfxEp8yM5Yg6pRkasvGajBUaMiuAYI+mt4qkMikCDc5VYeV7Uyh9jhYMEYQ6wP1e+MVO2nrVsLcmqAhF0/n6yz+ORlXJfcoJM+Zu9oegB8Kyte6HOnA5nJ5qnnTxW8NqgUoEy80pIMJl6u6JbwyTeTbSLmAnUucxl9JcgJxIkVhRtL4HTaoOYma9KJql4v0glfIEMNOjkEmwwGm4jxNvN0EqvghLL7oOBoqJBcYxO1Blm7XZfSBwVbFRv6VS5HY+850jmN5rP37Ce/UYFm13TWKFFYg0OI9LLRutlEUaA4WzI4SNAnw6kXqhzrsigm2Zt+8oMI5kDp3a62pPdILEgwmVDrbkclYcQrKoBjVLEKgJIwEpqnhiQlydeGRVae46uC9BAZ3D3df5Em/sEwDEa3r18nwdTK8TeJFFaOodVXQeU4B1AylGMkuK+/cpwDEwWUYyTSX0HlOP97JBYkaGRWTznOj5FQ5diBVmb1lOP8GPFSjtEDzY0NCmyu1M8X4xjoUyJR542KiqUJItKiYjh3VDhT0yI6epkdaFi1HOyVcnjJPbg17fmBN7esXqbBKDarilhTme0m3OwSaE3RmZOvmFcsjBXbvYoCJcO1gx1+qlO9dVFM0r8SYW6hGBlISVPvcuegfpNYZ9SKRAlpPLZiL4cbjVuG5F+j0w+yPmUck4evD3QKRPZmg08nbN7lXm4hi2ZOFfHJ5/j9QH0r9nvW2Ki3X5t43LmGSmqVAH576+eQ8Rb8VlYLj9vawMj8l8TZ3I7vhD25YkenEyW/OioGLFju8iVz+ICluMyR16sPzxxYv+SXs5DBghll9JHETSQoTzTudURngiLMRFp7XteQqKRLWut7nznLDlO2foIcbMan24VCOQbW+l4xMXSFVuppr2oSRd7Rlfgrv0FlXXCJsxZxpQ0vF6Of6HKkx4rJjn6mulfWkkBifPpeZ67Jyj0hTRnjG11VoYiLjK4aCRZiwnL4uoBlWcpbraOr38xRJLqK3mQdXc0FlIzcIM2bWReFRHBwFb1d6NtasUcUjNqtWpXcthEW1CwjaIfeNow8xzE7Pmc8K+P4o/JEEcUb1p58+c9rZFTbAqAO+uU7r4HKABSvcB1uu2XO3xAt8efNM0W4w/C1wbsGNDb3zOxs4To6UeT7yfD7g/ZdInK0DtcVxUoMNmW73EsTMrzCdfgyVCpcR2eCKsysVLiuKCQyNMkW1Pl1jn+U5O/hVa+H3566OqTIlC/8WVbokLqnfNGJoqgOmfK2YilfRbESgk2aSK9NzJXa5oEdc02oKjvmaqVtSeYbDyPoCiaYAmKiaaq/3uRJG+gxyWOoQh7iHF1mxJ6ckPYG5Uses6rkoeZFbzx5bFNArbupUkPxv+wy6HP5y+k+NaaX2zt39mfr8+3i3B43Wm5G+qQeF9n0cYjOBy2H1fJZRqsEU7dMM5w87YzkcRTZuBzyIGqXRR5igiGEPJ0qkAc7aoIW1ZfNHYtIOzSY+xY5oSNA6UkdJ9pwh+qRZwqetNJGOnlIOcJMQSUmWJYAwWPpZqtTYwds8ijSHcoyCfK4LPIQEyxbBHl0M7dwlaeTkTyp30s2eRwy+b3NUnnIE0w6IsijkrnFz0uIVGZQ24xLJw9ZDsA0tsjubI4I8uhmbFHbPbPJo4rkIXWeTk5jyxQieXQztqg9jtnkMRUhj5kzPkFOINyKfMhj62ZtUQUKW+dR1M1j5pU8thDy6GZtUQUKmzyKSh5mfIKcYLdEkMeoAnlSgcL0ESpSyUy6/Oy8PkKzKcBHaOtmqVPlCZM7HUW4Q55N2mJxh5hgtkRwx9KMO2+9rrl78GZfHJ0/HvZ/fPZuD3/OMxkXuYO7g0oPqhdKtkr9Bnqjk+63zPb+ioGjm4+LtuZsQ1MRseuS5dyskDA5wRDhpbB181LgL3ZWQ9NRxMXlujmd6+QEU4Sh6ehmaOLkyXroi6FIIhyQPFZOyeOK4I5u+h5Kicx2Jh8fBdLiigjCkYdIzm40mfXNgfxGB3HwHiu+Q44nDirixEHdzqzCOZg1H0oYBwm/VlsQB1kKmBwOVkJ5xywruRwkHPOJfsWdgyw9Tg4HdYtz4+oZ4nuRy0EigbwjiIOsoJUcDupmiOIcRBLbe8ed3bH1cnj8ePt8++PmpNu56czTwbiTkGzM2WpyYiHobsfM+FkabyY5TlxJmGrD2pAQN2gzk1CRyKlr5DMmyPHLXXbB+HaR0UKqflzdHC20fZcd0FeDlYxtkj1BSCaRa2hGHVSkWYh9Qc2UlU0eziIN5MvmHW+IyK91dYsqZk5UQrdbVWqKiicqdViSsNh4ITVLrm7OwcwpmDg5FRGcZBUJOwWTmOA0GWSzi423RHQRcHXzGhaMvKnBTUIMMuNuMjLL3bSXmszTQNpk7Rhy0hXW6IuMVq2TQoPnZcEO74eT6esMbQHnf5R40gd+lMha53/MuZLr/A+hwCEnqF70+j19zigrCsz7Mihz7xvEqIxObThGmQ+XKPj0uQUR6WNEVqWMMyWoqaDLh0pow1s6E8T3EKQmfBLNOGsQxPT3pebqET03a0zEHAoxeNnvjxsvb8cHpx83n93d5vbBacOEXbFpEjyzYEb0y5Wy2iANPxvqjNihQK0mr1VBjoOYzMwLo3m1342XJyLUIP6ee2/iBYMwYqEYfZKk9FxdzK1oztTHTOfJIbAvwkthFlWfFAyqAUDV7jy5MoHivEXgGOU7PmJNcbTOMmC2TxkaJL4MiO1TE3VGDv4KJf7jcKPcryFZBYkU2QGN0e0aIQZCQpXNFvTFyZbueOoHxlt+wh4ee7LZdupaNHVlynbosOEh2zcTARmiHDlmhoco32hAhEpuAyqkakpuXqe84asCdcKr/vXJTuWoOqOHJOltQL3voEZBsgQ3lTXksVAQPwkBdTvNzoFcy+Mk05BHonPXNSSrIOEsO8z2+XRwMfWOfjuhe3o+3LEv3htCdA16SIKsnTHTNAdGNkSLX/AMCtTT17BKiSxUrhTOY+GHnJVvK1z7kfMfmSkyKcLS3qXNDAXPiaBIjoSlvUu7TEhkZExY2ru0OSDEyzGC3l7aVFU54c7LEYKDBHXqE16eEJXJOmeDIhI+JcEiLrx8I5rgIsPggdlGNBmypsGzWtysXAQsP6cMGYLeChSklxqKEIZtvpoe/CUI+tvQdrnUUICUiIoM+bFxxbZEORezhgytW0R6XVCSqSBSpbfwRbHZuFrTUrBBGjJRsqpkYbNxpZalYJOKITY4jkxwNq5zWTngIFXbq9UlWdhsXEevcrAxMmKzIpYiBpv09a4YOEgTeUpEVho4G3eOSinguFnB6UgFZ+MaV+cFJ3OHJUoBTQF0kqmgAxI4Jn35K8rqU6h0s7mSuzLhBNfeUKQmWC8SnBKjLErwvLw06VRgjy+5TyFOHe1tJWpmOJs6RQ3Z9ahDng3CaIQOxpd8EA1OHe0tOWoOO5s6Rc3s9ahDdshg9C8nx5fd0ginjvaGJjWvnE2dovryetQh+6IxugiC8YYA6hjam8HUZHgmdewV6QOcqUP2e2ScWAnGF2vBF30MfD9cHB4Mpg/H/tCLR/wH \ No newline at end of file diff --git a/docs/research.md b/docs/research.md index 9fe4ab5..9b87324 100644 --- a/docs/research.md +++ b/docs/research.md @@ -100,7 +100,7 @@ int main() { Here's a list of features our PPU should have: -- 256x224 @ 60Hz VGA output +- 320x240 @ 60Hz VGA output - single tilemap with room for 1024 tiles of 16x16 pixels - 8 colors per palette, with 4096 possible colors (12-bit color depth) - 512x448 background canvas with scrolling @@ -116,6 +116,11 @@ Notable differences: - NES nametable equivalent is called BAM (background attribute register) - NES OAM equivalent is called FAM (foreground attribute register) +- 320x240 @ 60Hz output + + Since we're using VGA, we can't use custom resolutions without an + upscaler/downscaler. This resolution was chosen because it's exactly half of + the lowest standard VGA resolution 640x480. - No scanline sprite limit Unless not imposing any sprite limit makes the hardware implementation @@ -176,13 +181,22 @@ Notable differences: Important notes: -- The STM32 receives 'feedback' lines from the PPU. These are mirrors of the - VSYNC and HSYNC lines from the VGA signal generator. These lines can be used - to trigger interrupts for counting frames, and to make sure no read/write - conflicts occur for protected memory regions in the PPU. -- The STM32 can enable and reset the PPU. These lines will also be connected to - physical buttons on the FPGA. +- The STM32 can reset the PPU. This line will also be connected to a physical + button on the FPGA. - The STM32 uses direct memory access to control the PPU. +- The PPU's native resolution is 320x240. It works in this resolution as if it + is a valid VGA signal. The STM32 is also only aware of this resolution. This + resolution is referred to as "tiny" resolution. Because VGA-compatible LCD's + likely don't support this resolution due to low clock speed, a built-in + pixel-perfect 2X upscaler is chained after the PPU's "tiny" output. This + means that the display sees the resolution as 640x480, but the PPU and STM32 + only work in 320x240. +- The STM32 receives the TVSYNC and THSYNC lines from the PPU. These are the + VSYNC and HSYNC lines from the tiny VGA signal generator. These lines can be + used to trigger interrupts for counting frames, and to make sure no + read/write conflicts occur for protected memory regions in the PPU. +- NVSYNC, NHSYNC and the RGB signals refer to the output of the native VGA + signal generator. #### Level 2 @@ -194,8 +208,8 @@ Important notes: 1. - (Foreground sprite info) calculate if foreground sprite exists at current pixel using FAM register - (Background sprite info) get background sprite info from BAM register - 3. - (Sprite render) calculate pixel to read from TMM based on sprite info - 5. - (Compositor) get pixel with 'highest' priority (pick first foreground + 2. - (Sprite render) calculate pixel to read from TMM based on sprite info + 3. - (Compositor) get pixel with 'highest' priority (pick first foreground sprite with non-transparent color at current pixel in order, fallback to background) - (Palette lookup) lookup palette color using palette register -- cgit v1.2.3