Skip to content

[wip] use 1/4th of flash for character definitions #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

[wip] use 1/4th of flash for character definitions #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions SOFTWARE/Demo-Tetris/src/chardefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,15 +37,15 @@
#define CHAR_HEIGHT_BITS 0x03
#define CHAR_HEIGHT_MASK 0b00000111

#define SPLIT_VALUE(val) \
((((val>>7)&1)?(1<<2):(1<<18)) | \
(((val>>6)&1)?(1<<3):(1<<19)) | \
(((val>>5)&1)?(1<<4):(1<<20)) | \
(((val>>4)&1)?(1<<5):(1<<21)) | \
(((val>>3)&1)?(1<<6):(1<<22)) | \
(((val>>2)&1)?(1<<7):(1<<23)) | \
(((val>>1)&1)?(1<<8):(1<<24)) | \
(((val>>0)&1)?(1<<9):(1<<25)))
#define SPLIT_VALUE(val) \
((((val >> 7) & 1) ? (1 << 0) : 0) | \
(((val >> 6) & 1) ? (1 << 1) : 0) | \
(((val >> 5) & 1) ? (1 << 2) : 0) | \
(((val >> 4) & 1) ? (1 << 3) : 0) | \
(((val >> 3) & 1) ? (1 << 4) : 0) | \
(((val >> 2) & 1) ? (1 << 5) : 0) | \
(((val >> 1) & 1) ? (1 << 6) : 0) | \
(((val >> 0) & 1) ? (1 << 7) : 0))

//--------------------------------

Expand Down
52 changes: 26 additions & 26 deletions SOFTWARE/Demo-Tetris/src/vga.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extern void waste_time(uint8_t d);

// These are the character definitions in ROM (flash memory).
//
const uint32_t vga_character_defs[CHAR_HEIGHT][CHARS_COUNT] = {
const uint8_t vga_character_defs[CHAR_HEIGHT][CHARS_COUNT] = {
CHARSET_LINE(0),
CHARSET_LINE(1),
CHARSET_LINE(2),
Expand Down Expand Up @@ -249,7 +249,7 @@ static uint32_t frame_prepared_line = 0xFFFFFFFF;
uint32_t frame_line_bits[VGA_NUM_COLS];

inline static void vga_prepare_line(uint32_t line) {
static const uint32_t* char_defs = NULL;
static const uint8_t* char_defs = NULL;
static uint8_t* char_indexes = NULL;

if (frame_prepared_line == line) {
Expand Down Expand Up @@ -304,30 +304,30 @@ inline static void vga_prepare_line(uint32_t line) {
frame_line_bits[30] = char_defs[char_indexes[30] & CHARS_COUNT_MASK] ^ (vga_cursor_pos.col == 30 ? MASK : 0);
#endif
#else
frame_line_bits[ 0] = char_defs[char_indexes[ 0] & CHARS_COUNT_MASK];
frame_line_bits[ 1] = char_defs[char_indexes[ 1] & CHARS_COUNT_MASK];
frame_line_bits[ 2] = char_defs[char_indexes[ 2] & CHARS_COUNT_MASK];
frame_line_bits[ 3] = char_defs[char_indexes[ 3] & CHARS_COUNT_MASK];
frame_line_bits[ 4] = char_defs[char_indexes[ 4] & CHARS_COUNT_MASK];
frame_line_bits[ 5] = char_defs[char_indexes[ 5] & CHARS_COUNT_MASK];
frame_line_bits[ 6] = char_defs[char_indexes[ 6] & CHARS_COUNT_MASK];
frame_line_bits[ 7] = char_defs[char_indexes[ 7] & CHARS_COUNT_MASK];
frame_line_bits[ 8] = char_defs[char_indexes[ 8] & CHARS_COUNT_MASK];
frame_line_bits[ 9] = char_defs[char_indexes[ 9] & CHARS_COUNT_MASK];
frame_line_bits[10] = char_defs[char_indexes[10] & CHARS_COUNT_MASK];
frame_line_bits[11] = char_defs[char_indexes[11] & CHARS_COUNT_MASK];
frame_line_bits[12] = char_defs[char_indexes[12] & CHARS_COUNT_MASK];
frame_line_bits[13] = char_defs[char_indexes[13] & CHARS_COUNT_MASK];
frame_line_bits[14] = char_defs[char_indexes[14] & CHARS_COUNT_MASK];
frame_line_bits[15] = char_defs[char_indexes[15] & CHARS_COUNT_MASK];
frame_line_bits[16] = char_defs[char_indexes[16] & CHARS_COUNT_MASK];
frame_line_bits[17] = char_defs[char_indexes[17] & CHARS_COUNT_MASK];
frame_line_bits[18] = char_defs[char_indexes[18] & CHARS_COUNT_MASK];
frame_line_bits[19] = char_defs[char_indexes[19] & CHARS_COUNT_MASK];
frame_line_bits[20] = char_defs[char_indexes[20] & CHARS_COUNT_MASK];
frame_line_bits[21] = char_defs[char_indexes[21] & CHARS_COUNT_MASK];
frame_line_bits[22] = char_defs[char_indexes[22] & CHARS_COUNT_MASK];
#if VGA_NUM_COLS > 23
frame_line_bits[ 0] = char_defs[char_indexes[ 0] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 1] = char_defs[char_indexes[ 1] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 2] = char_defs[char_indexes[ 2] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 3] = char_defs[char_indexes[ 3] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 4] = char_defs[char_indexes[ 4] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 5] = char_defs[char_indexes[ 5] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 6] = char_defs[char_indexes[ 6] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 7] = char_defs[char_indexes[ 7] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 8] = char_defs[char_indexes[ 8] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[ 9] = char_defs[char_indexes[ 9] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[10] = char_defs[char_indexes[10] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[11] = char_defs[char_indexes[11] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[12] = char_defs[char_indexes[12] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[13] = char_defs[char_indexes[13] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[14] = char_defs[char_indexes[14] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[15] = char_defs[char_indexes[15] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[16] = char_defs[char_indexes[16] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[17] = char_defs[char_indexes[17] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[18] = char_defs[char_indexes[18] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[19] = char_defs[char_indexes[19] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[20] = char_defs[char_indexes[20] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[21] = char_defs[char_indexes[21] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
frame_line_bits[22] = char_defs[char_indexes[22] & CHARS_COUNT_MASK] << 2 | 0xfffffc00;
#if VGA_NUM_COLS > 23
frame_line_bits[23] = char_defs[char_indexes[23] & CHARS_COUNT_MASK];
frame_line_bits[24] = char_defs[char_indexes[24] & CHARS_COUNT_MASK];
frame_line_bits[25] = char_defs[char_indexes[25] & CHARS_COUNT_MASK];
Expand Down