From: Greg King Date: Tue, 5 Mar 2019 20:52:00 +0000 (-0500) Subject: Fixed the CBM screen-code C header. X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7e298e347d306fd80722e8de7cf21ce26965cfb2;p=cc65 Fixed the CBM screen-code C header. Changed the number literals from Assembly format to C format. Swapped the (upper-/lower-case) mappings of letters because the header converts from ASCII, not PetSCII. --- diff --git a/include/c64_screen_charmap.h b/include/c64_screen_charmap.h index 861ad2704..76e0d7d7b 100644 --- a/include/c64_screen_charmap.h +++ b/include/c64_screen_charmap.h @@ -1,290 +1,311 @@ /*****************************************************************************/ /* */ -/* c64_screen_charmap.h */ +/* cbm_screen_charmap.h */ /* */ /* (c) Copyright 2019, Gerhard W. Gruber (sparhawk@gmx.at) */ /* */ -/* When using C64 mode, this include converts the characters */ -/* from PETSCII to screen mapping, so you can write directly to */ -/* the screen memory. */ +/* When using CBM mode, this include converts character literals */ +/* from ASCII to screen-code mapping, so you can write directly */ +/* to the screen memory. */ /* */ -/* If this include is used, no additional macros are needed */ +/* If this include is used, no additional macroes are needed. */ /* */ /*****************************************************************************/ /* No include guard here! Multiple use in one file may be intentional. */ -// Char $00 ... $1F -> c + 128 #pragma warn (remap-zero, push, off) -#pragma charmap ($00, $80) -#pragma warn (remap-zero, pop) -#pragma charmap ($01, $81) -#pragma charmap ($02, $82) -#pragma charmap ($03, $83) -#pragma charmap ($04, $84) -#pragma charmap ($05, $85) -#pragma charmap ($06, $86) -#pragma charmap ($07, $87) -#pragma charmap ($08, $88) -#pragma charmap ($09, $89) -#pragma charmap ($0A, $8A) -#pragma charmap ($0B, $8B) -#pragma charmap ($0C, $8C) -#pragma charmap ($0D, $8D) -#pragma charmap ($0E, $8E) -#pragma charmap ($0F, $8F) -#pragma charmap ($10, $90) -#pragma charmap ($11, $91) -#pragma charmap ($12, $92) -#pragma charmap ($13, $93) -#pragma charmap ($14, $94) -#pragma charmap ($15, $95) -#pragma charmap ($16, $96) -#pragma charmap ($17, $97) -#pragma charmap ($18, $98) -#pragma charmap ($19, $99) -#pragma charmap ($1A, $9A) -#pragma charmap ($1B, $9B) -#pragma charmap ($1C, $9C) -#pragma charmap ($1D, $9D) -#pragma charmap ($1E, $9E) -#pragma charmap ($1F, $9F) +// Char $00 -> c + 128 +#pragma charmap (0x00, 0x80) + +// Char $01 ... $1A -> c + 128 + 64 (control alphabet) +#pragma charmap (0x01, 0xC1) +#pragma charmap (0x02, 0xC2) +#pragma charmap (0x03, 0xC3) +#pragma charmap (0x04, 0xC4) +#pragma charmap (0x05, 0xC5) +#pragma charmap (0x06, 0xC6) +#pragma charmap (0x07, 0xC7) +#pragma charmap (0x08, 0xC8) +#pragma charmap (0x09, 0xC9) +#pragma charmap (0x0A, 0xCA) +#pragma charmap (0x0B, 0xCB) +#pragma charmap (0x0C, 0xCC) +#pragma charmap (0x0D, 0xCD) +#pragma charmap (0x0E, 0xCE) +#pragma charmap (0x0F, 0xCF) +#pragma charmap (0x10, 0xD0) +#pragma charmap (0x11, 0xD1) +#pragma charmap (0x12, 0xD2) +#pragma charmap (0x13, 0xD3) +#pragma charmap (0x14, 0xD4) +#pragma charmap (0x15, 0xD5) +#pragma charmap (0x16, 0xD6) +#pragma charmap (0x17, 0xD7) +#pragma charmap (0x18, 0xD8) +#pragma charmap (0x19, 0xD9) +#pragma charmap (0x1A, 0xDA) + +// Char $1B ... $1F -> c + 128 +#pragma charmap (0x1B, 0x9B) +#pragma charmap (0x1C, 0x9C) +#pragma charmap (0x1D, 0x9D) +#pragma charmap (0x1E, 0x9E) +#pragma charmap (0x1F, 0x9F) + +// Char $20 ... $3F -> c +#pragma charmap (0x20, 0x20) +#pragma charmap (0x21, 0x21) +#pragma charmap (0x22, 0x22) +#pragma charmap (0x23, 0x23) +#pragma charmap (0x24, 0x24) +#pragma charmap (0x25, 0x25) +#pragma charmap (0x26, 0x26) +#pragma charmap (0x27, 0x27) +#pragma charmap (0x28, 0x28) +#pragma charmap (0x29, 0x29) +#pragma charmap (0x2A, 0x2A) +#pragma charmap (0x2B, 0x2B) +#pragma charmap (0x2C, 0x2C) +#pragma charmap (0x2D, 0x2D) +#pragma charmap (0x2E, 0x2E) +#pragma charmap (0x2F, 0x2F) +#pragma charmap (0x30, 0x30) +#pragma charmap (0x31, 0x31) +#pragma charmap (0x32, 0x32) +#pragma charmap (0x33, 0x33) +#pragma charmap (0x34, 0x34) +#pragma charmap (0x35, 0x35) +#pragma charmap (0x36, 0x36) +#pragma charmap (0x37, 0x37) +#pragma charmap (0x38, 0x38) +#pragma charmap (0x39, 0x39) +#pragma charmap (0x3A, 0x3A) +#pragma charmap (0x3B, 0x3B) +#pragma charmap (0x3C, 0x3C) +#pragma charmap (0x3D, 0x3D) +#pragma charmap (0x3E, 0x3E) +#pragma charmap (0x3F, 0x3F) + +// Char $40 -> c - 64 +#pragma charmap (0x40, 0x00) + +// Char $41 ... $5A -> c (upper-case alphabet) +#pragma charmap (0x41, 0x41) +#pragma charmap (0x42, 0x42) +#pragma charmap (0x43, 0x43) +#pragma charmap (0x44, 0x44) +#pragma charmap (0x45, 0x45) +#pragma charmap (0x46, 0x46) +#pragma charmap (0x47, 0x47) +#pragma charmap (0x48, 0x48) +#pragma charmap (0x49, 0x49) +#pragma charmap (0x4A, 0x4A) +#pragma charmap (0x4B, 0x4B) +#pragma charmap (0x4C, 0x4C) +#pragma charmap (0x4D, 0x4D) +#pragma charmap (0x4E, 0x4E) +#pragma charmap (0x4F, 0x4F) +#pragma charmap (0x50, 0x50) +#pragma charmap (0x51, 0x51) +#pragma charmap (0x52, 0x52) +#pragma charmap (0x53, 0x53) +#pragma charmap (0x54, 0x54) +#pragma charmap (0x55, 0x55) +#pragma charmap (0x56, 0x56) +#pragma charmap (0x57, 0x57) +#pragma charmap (0x58, 0x58) +#pragma charmap (0x59, 0x59) +#pragma charmap (0x5A, 0x5A) + +// Char $5B ... $5F -> c - 64 +#pragma charmap (0x5B, 0x1B) +#pragma charmap (0x5C, 0x1C) +#pragma charmap (0x5D, 0x1D) +#pragma charmap (0x5E, 0x1E) +#pragma charmap (0x5F, 0x1F) -// Char $20 ... $3F -> c = c -#pragma charmap ($20, $20) -#pragma charmap ($21, $21) -#pragma charmap ($22, $22) -#pragma charmap ($23, $23) -#pragma charmap ($24, $24) -#pragma charmap ($25, $25) -#pragma charmap ($26, $26) -#pragma charmap ($27, $27) -#pragma charmap ($28, $28) -#pragma charmap ($29, $29) -#pragma charmap ($2A, $2A) -#pragma charmap ($2B, $2B) -#pragma charmap ($2C, $2C) -#pragma charmap ($2D, $2D) -#pragma charmap ($2E, $2E) -#pragma charmap ($2F, $2F) -#pragma charmap ($30, $30) -#pragma charmap ($31, $31) -#pragma charmap ($32, $32) -#pragma charmap ($33, $33) -#pragma charmap ($34, $34) -#pragma charmap ($35, $35) -#pragma charmap ($36, $36) -#pragma charmap ($37, $37) -#pragma charmap ($38, $38) -#pragma charmap ($39, $39) -#pragma charmap ($3A, $3A) -#pragma charmap ($3B, $3B) -#pragma charmap ($3C, $3C) -#pragma charmap ($3D, $3D) -#pragma charmap ($3E, $3E) -#pragma charmap ($3F, $3F) +// Char $60 -> c - 32 +#pragma charmap (0x60, 0x40) -// Char $40 ... $5F -> c - 64 -#pragma charmap ($40, $00) -#pragma charmap ($41, $01) -#pragma charmap ($42, $02) -#pragma charmap ($43, $03) -#pragma charmap ($44, $04) -#pragma charmap ($45, $05) -#pragma charmap ($46, $06) -#pragma charmap ($47, $07) -#pragma charmap ($48, $08) -#pragma charmap ($49, $09) -#pragma charmap ($4A, $0A) -#pragma charmap ($4B, $0B) -#pragma charmap ($4C, $0C) -#pragma charmap ($4D, $0D) -#pragma charmap ($4E, $0E) -#pragma charmap ($4F, $0F) -#pragma charmap ($50, $10) -#pragma charmap ($51, $11) -#pragma charmap ($52, $12) -#pragma charmap ($53, $13) -#pragma charmap ($54, $14) -#pragma charmap ($55, $15) -#pragma charmap ($56, $16) -#pragma charmap ($57, $17) -#pragma charmap ($58, $18) -#pragma charmap ($59, $19) -#pragma charmap ($5A, $1A) -#pragma charmap ($5B, $1B) -#pragma charmap ($5C, $1C) -#pragma charmap ($5D, $1D) -#pragma charmap ($5E, $1E) -#pragma charmap ($5F, $1F) +// Char $61 ... $7A -> c - 32 - 64 (lower-case alphabet) +#pragma charmap (0x61, 0x01) +#pragma charmap (0x62, 0x02) +#pragma charmap (0x63, 0x03) +#pragma charmap (0x64, 0x04) +#pragma charmap (0x65, 0x05) +#pragma charmap (0x66, 0x06) +#pragma charmap (0x67, 0x07) +#pragma charmap (0x68, 0x08) +#pragma charmap (0x69, 0x09) +#pragma charmap (0x6A, 0x0A) +#pragma charmap (0x6B, 0x0B) +#pragma charmap (0x6C, 0x0C) +#pragma charmap (0x6D, 0x0D) +#pragma charmap (0x6E, 0x0E) +#pragma charmap (0x6F, 0x0F) +#pragma charmap (0x70, 0x10) +#pragma charmap (0x71, 0x11) +#pragma charmap (0x72, 0x12) +#pragma charmap (0x73, 0x13) +#pragma charmap (0x74, 0x14) +#pragma charmap (0x75, 0x15) +#pragma charmap (0x76, 0x16) +#pragma charmap (0x77, 0x17) +#pragma charmap (0x78, 0x18) +#pragma charmap (0x79, 0x19) +#pragma charmap (0x7A, 0x1A) -// Char $60 ... $7F -> c - 32 -#pragma charmap ($60, $40) -#pragma charmap ($61, $41) -#pragma charmap ($62, $42) -#pragma charmap ($63, $43) -#pragma charmap ($64, $44) -#pragma charmap ($65, $45) -#pragma charmap ($66, $46) -#pragma charmap ($67, $47) -#pragma charmap ($68, $48) -#pragma charmap ($69, $49) -#pragma charmap ($6A, $4A) -#pragma charmap ($6B, $4B) -#pragma charmap ($6C, $4C) -#pragma charmap ($6D, $4D) -#pragma charmap ($6E, $4E) -#pragma charmap ($6F, $4F) -#pragma charmap ($70, $50) -#pragma charmap ($71, $51) -#pragma charmap ($72, $52) -#pragma charmap ($73, $53) -#pragma charmap ($74, $54) -#pragma charmap ($75, $55) -#pragma charmap ($76, $56) -#pragma charmap ($77, $57) -#pragma charmap ($78, $58) -#pragma charmap ($79, $59) -#pragma charmap ($7A, $5A) -#pragma charmap ($7B, $5B) -#pragma charmap ($7C, $5C) -#pragma charmap ($7D, $5D) -#pragma charmap ($7E, $5E) -#pragma charmap ($7F, $5F) +// Char $7B ... $7F -> c - 32 +#pragma charmap (0x7B, 0x5B) +#pragma charmap (0x7C, 0x5C) +#pragma charmap (0x7D, 0x5D) +#pragma charmap (0x7E, 0x5E) +#pragma charmap (0x7F, 0x5F) -// Char $80 ... $9F -> c + 64 -#pragma charmap ($80, $C0) -#pragma charmap ($81, $C1) -#pragma charmap ($82, $C2) -#pragma charmap ($83, $C3) -#pragma charmap ($84, $C4) -#pragma charmap ($85, $C5) -#pragma charmap ($86, $C6) -#pragma charmap ($87, $C7) -#pragma charmap ($88, $C8) -#pragma charmap ($89, $C9) -#pragma charmap ($8A, $CA) -#pragma charmap ($8B, $CB) -#pragma charmap ($8C, $CC) -#pragma charmap ($8D, $CD) -#pragma charmap ($8E, $CE) -#pragma charmap ($8F, $CF) -#pragma charmap ($90, $D0) -#pragma charmap ($91, $D1) -#pragma charmap ($92, $D2) -#pragma charmap ($93, $D3) -#pragma charmap ($94, $D4) -#pragma charmap ($95, $D5) -#pragma charmap ($96, $D6) -#pragma charmap ($97, $D7) -#pragma charmap ($98, $D8) -#pragma charmap ($99, $D9) -#pragma charmap ($9A, $DA) -#pragma charmap ($9B, $DB) -#pragma charmap ($9C, $DC) -#pragma charmap ($9D, $DD) -#pragma charmap ($9E, $DE) -#pragma charmap ($9F, $DF) +// Char $80 -> c + 64 +#pragma charmap (0x80, 0xC0) + +// Char $81 ... $9A -> c (control alphabet) +#pragma charmap (0x81, 0x81) +#pragma charmap (0x82, 0x82) +#pragma charmap (0x83, 0x83) +#pragma charmap (0x84, 0x84) +#pragma charmap (0x85, 0x85) +#pragma charmap (0x86, 0x86) +#pragma charmap (0x87, 0x87) +#pragma charmap (0x88, 0x88) +#pragma charmap (0x89, 0x89) +#pragma charmap (0x8A, 0x8A) +#pragma charmap (0x8B, 0x8B) +#pragma charmap (0x8C, 0x8C) +#pragma charmap (0x8D, 0x8D) +#pragma charmap (0x8E, 0x8E) +#pragma charmap (0x8F, 0x8F) +#pragma charmap (0x90, 0x90) +#pragma charmap (0x91, 0x91) +#pragma charmap (0x92, 0x92) +#pragma charmap (0x93, 0x93) +#pragma charmap (0x94, 0x94) +#pragma charmap (0x95, 0x95) +#pragma charmap (0x96, 0x96) +#pragma charmap (0x97, 0x97) +#pragma charmap (0x98, 0x98) +#pragma charmap (0x99, 0x99) +#pragma charmap (0x9A, 0x9A) + +// Char $9B ... $9F -> c + 64 +#pragma charmap (0x9B, 0xDB) +#pragma charmap (0x9C, 0xDC) +#pragma charmap (0x9D, 0xDD) +#pragma charmap (0x9E, 0xDE) +#pragma charmap (0x9F, 0xDF) // Char $A0 ... $BF -> c - 64 -#pragma charmap ($A0, $60) -#pragma charmap ($A1, $61) -#pragma charmap ($A2, $62) -#pragma charmap ($A3, $63) -#pragma charmap ($A4, $64) -#pragma charmap ($A5, $65) -#pragma charmap ($A6, $66) -#pragma charmap ($A7, $67) -#pragma charmap ($A8, $68) -#pragma charmap ($A9, $69) -#pragma charmap ($AA, $6A) -#pragma charmap ($AB, $6B) -#pragma charmap ($AC, $6C) -#pragma charmap ($AD, $6D) -#pragma charmap ($AE, $6E) -#pragma charmap ($AF, $6F) -#pragma charmap ($B0, $70) -#pragma charmap ($B1, $71) -#pragma charmap ($B2, $72) -#pragma charmap ($B3, $73) -#pragma charmap ($B4, $74) -#pragma charmap ($B5, $75) -#pragma charmap ($B6, $76) -#pragma charmap ($B7, $77) -#pragma charmap ($B8, $78) -#pragma charmap ($B9, $79) -#pragma charmap ($BA, $7A) -#pragma charmap ($BB, $7B) -#pragma charmap ($BC, $7C) -#pragma charmap ($BD, $7D) -#pragma charmap ($BE, $7E) -#pragma charmap ($BF, $7F) +#pragma charmap (0xA0, 0x60) +#pragma charmap (0xA1, 0x61) +#pragma charmap (0xA2, 0x62) +#pragma charmap (0xA3, 0x63) +#pragma charmap (0xA4, 0x64) +#pragma charmap (0xA5, 0x65) +#pragma charmap (0xA6, 0x66) +#pragma charmap (0xA7, 0x67) +#pragma charmap (0xA8, 0x68) +#pragma charmap (0xA9, 0x69) +#pragma charmap (0xAA, 0x6A) +#pragma charmap (0xAB, 0x6B) +#pragma charmap (0xAC, 0x6C) +#pragma charmap (0xAD, 0x6D) +#pragma charmap (0xAE, 0x6E) +#pragma charmap (0xAF, 0x6F) +#pragma charmap (0xB0, 0x70) +#pragma charmap (0xB1, 0x71) +#pragma charmap (0xB2, 0x72) +#pragma charmap (0xB3, 0x73) +#pragma charmap (0xB4, 0x74) +#pragma charmap (0xB5, 0x75) +#pragma charmap (0xB6, 0x76) +#pragma charmap (0xB7, 0x77) +#pragma charmap (0xB8, 0x78) +#pragma charmap (0xB9, 0x79) +#pragma charmap (0xBA, 0x7A) +#pragma charmap (0xBB, 0x7B) +#pragma charmap (0xBC, 0x7C) +#pragma charmap (0xBD, 0x7D) +#pragma charmap (0xBE, 0x7E) +#pragma charmap (0xBF, 0x7F) // Char $C0 ... $DF -> c - 128 -#pragma charmap ($C0, $40) -#pragma charmap ($C1, $41) -#pragma charmap ($C2, $42) -#pragma charmap ($C3, $43) -#pragma charmap ($C4, $44) -#pragma charmap ($C5, $45) -#pragma charmap ($C6, $46) -#pragma charmap ($C7, $47) -#pragma charmap ($C8, $48) -#pragma charmap ($C9, $49) -#pragma charmap ($CA, $4A) -#pragma charmap ($CB, $4B) -#pragma charmap ($CC, $4C) -#pragma charmap ($CD, $4D) -#pragma charmap ($CE, $4E) -#pragma charmap ($CF, $4F) -#pragma charmap ($D0, $50) -#pragma charmap ($D1, $51) -#pragma charmap ($D2, $52) -#pragma charmap ($D3, $53) -#pragma charmap ($D4, $54) -#pragma charmap ($D5, $55) -#pragma charmap ($D6, $56) -#pragma charmap ($D7, $57) -#pragma charmap ($D8, $58) -#pragma charmap ($D9, $59) -#pragma charmap ($DA, $5A) -#pragma charmap ($DB, $5B) -#pragma charmap ($DC, $5C) -#pragma charmap ($DD, $5D) -#pragma charmap ($DE, $5E) -#pragma charmap ($DF, $5F) +#pragma charmap (0xC0, 0x40) + +// Char $C1 ... $DA -> c - 128 - 64 (lower-case alphabet) +#pragma charmap (0xC1, 0x01) +#pragma charmap (0xC2, 0x02) +#pragma charmap (0xC3, 0x03) +#pragma charmap (0xC4, 0x04) +#pragma charmap (0xC5, 0x05) +#pragma charmap (0xC6, 0x06) +#pragma charmap (0xC7, 0x07) +#pragma charmap (0xC8, 0x08) +#pragma charmap (0xC9, 0x09) +#pragma charmap (0xCA, 0x0A) +#pragma charmap (0xCB, 0x0B) +#pragma charmap (0xCC, 0x0C) +#pragma charmap (0xCD, 0x0D) +#pragma charmap (0xCE, 0x0E) +#pragma charmap (0xCF, 0x0F) +#pragma charmap (0xD0, 0x10) +#pragma charmap (0xD1, 0x11) +#pragma charmap (0xD2, 0x12) +#pragma charmap (0xD3, 0x13) +#pragma charmap (0xD4, 0x14) +#pragma charmap (0xD5, 0x15) +#pragma charmap (0xD6, 0x16) +#pragma charmap (0xD7, 0x17) +#pragma charmap (0xD8, 0x18) +#pragma charmap (0xD9, 0x19) +#pragma charmap (0xDA, 0x1A) -// Char $E0 ... $FE -> c - 128 -#pragma charmap ($E0, $60) -#pragma charmap ($E1, $61) -#pragma charmap ($E2, $62) -#pragma charmap ($E3, $63) -#pragma charmap ($E4, $64) -#pragma charmap ($E5, $65) -#pragma charmap ($E6, $66) -#pragma charmap ($E7, $67) -#pragma charmap ($E8, $68) -#pragma charmap ($E9, $69) -#pragma charmap ($EA, $6A) -#pragma charmap ($EB, $6B) -#pragma charmap ($EC, $6C) -#pragma charmap ($ED, $6D) -#pragma charmap ($EE, $6E) -#pragma charmap ($EF, $6F) -#pragma charmap ($F0, $70) -#pragma charmap ($F1, $71) -#pragma charmap ($F2, $72) -#pragma charmap ($F3, $73) -#pragma charmap ($F4, $74) -#pragma charmap ($F5, $75) -#pragma charmap ($F6, $76) -#pragma charmap ($F7, $77) -#pragma charmap ($F8, $78) -#pragma charmap ($F9, $79) -#pragma charmap ($FA, $7A) -#pragma charmap ($FB, $7B) -#pragma charmap ($FC, $7C) -#pragma charmap ($FD, $7D) -#pragma charmap ($FE, $7E) -#pragma charmap ($FF, $5E) +// Char $DB ... $DF -> c - 128 +#pragma charmap (0xDB, 0x5B) +#pragma charmap (0xDC, 0x5C) +#pragma charmap (0xDD, 0x5D) +#pragma charmap (0xDE, 0x5E) +#pragma charmap (0xDF, 0x5F) + +// Char $E0 ... $FF -> c - 128 +#pragma charmap (0xE0, 0x60) +#pragma charmap (0xE1, 0x61) +#pragma charmap (0xE2, 0x62) +#pragma charmap (0xE3, 0x63) +#pragma charmap (0xE4, 0x64) +#pragma charmap (0xE5, 0x65) +#pragma charmap (0xE6, 0x66) +#pragma charmap (0xE7, 0x67) +#pragma charmap (0xE8, 0x68) +#pragma charmap (0xE9, 0x69) +#pragma charmap (0xEA, 0x6A) +#pragma charmap (0xEB, 0x6B) +#pragma charmap (0xEC, 0x6C) +#pragma charmap (0xED, 0x6D) +#pragma charmap (0xEE, 0x6E) +#pragma charmap (0xEF, 0x6F) +#pragma charmap (0xF0, 0x70) +#pragma charmap (0xF1, 0x71) +#pragma charmap (0xF2, 0x72) +#pragma charmap (0xF3, 0x73) +#pragma charmap (0xF4, 0x74) +#pragma charmap (0xF5, 0x75) +#pragma charmap (0xF6, 0x76) +#pragma charmap (0xF7, 0x77) +#pragma charmap (0xF8, 0x78) +#pragma charmap (0xF9, 0x79) +#pragma charmap (0xFA, 0x7A) +#pragma charmap (0xFB, 0x7B) +#pragma charmap (0xFC, 0x7C) +#pragma charmap (0xFD, 0x7D) +#pragma charmap (0xFE, 0x7E) +#pragma charmap (0xFF, 0x7F) + +#pragma warn (remap-zero, pop)