From f569849e57e2f1c20bac0faf19164a8d6f3dcb39 Mon Sep 17 00:00:00 2001 From: Thomas Huth Date: Mon, 8 Sep 2025 18:59:31 +0200 Subject: [PATCH] zipl/boot: Fix EBCDIC code page 500 conversion and decrease size by 200 bytes The tables ebcdic_037 and ebcdic_500 are currently exactly the same, though the 500 should differ at 7 entries (see the tables in the Linux kernel or https://www.ibm.com/docs/en/db2-for-zos/12.0.0?topic=ebcdic-code-point-differences-between-ccsids for example). Fix it by removing the ebcdic_500 table and by patching the other table during start() if necessary. That way we can safe also about 200 bytes in the stage3.bin binary. Fixes: https://github.com/ibm-s390-linux/s390-tools/issues/125 Closes: https://github.com/ibm-s390-linux/s390-tools/pull/190 Suggested-by: Euan Bourke Tested-by: Euan Bourke Reviewed-by: Euan Bourke Acked-by: Steffen Eiden Signed-off-by: Thomas Huth Signed-off-by: Steffen Eiden --- zipl/boot/ebcdic_conv.c | 90 ++++++++--------------------------------- zipl/boot/ebcdic_conv.h | 1 + zipl/boot/stage3.c | 2 + 3 files changed, 19 insertions(+), 74 deletions(-) diff --git a/zipl/boot/ebcdic_conv.c b/zipl/boot/ebcdic_conv.c index 7fc6086e..b45d4bd0 100644 --- a/zipl/boot/ebcdic_conv.c +++ b/zipl/boot/ebcdic_conv.c @@ -13,7 +13,8 @@ #include "boot/s390.h" -static unsigned char ebcdic_037[256] = { +/* EBCDIC-to-ASCII table, using EBCDIC code page 037 by default */ +static unsigned char ebcdic[256] = { /* 0x00 NUL SOH STX ETX *SEL HT *RNL DEL */ 0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F, /* 0x08 -GE -SPS -RPT VT FF CR SO SI */ @@ -84,84 +85,25 @@ static unsigned char ebcdic_037[256] = { 0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07 }; -static unsigned char ebcdic_500[256] = { -/* 0x00 NUL SOH STX ETX *SEL HT *RNL DEL */ - 0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F, -/* 0x08 -GE -SPS -RPT VT FF CR SO SI */ - 0x07, 0x07, 0x07, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, -/* 0x10 DLE DC1 DC2 DC3 -RES -NL BS -POC - -ENP ->LF */ - 0x10, 0x11, 0x12, 0x13, 0x07, 0x0A, 0x08, 0x07, -/* 0x18 CAN EM -UBS -CU1 -IFS -IGS -IRS -ITB - -IUS */ - 0x18, 0x19, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, -/* 0x20 -DS -SOS FS -WUS -BYP LF ETB ESC - -INP */ - 0x07, 0x07, 0x1C, 0x07, 0x07, 0x0A, 0x17, 0x1B, -/* 0x28 -SA -SFE -SM -CSP -MFA ENQ ACK BEL - -SW */ - 0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07, -/* 0x30 ---- ---- SYN -IR -PP -TRN -NBS EOT */ - 0x07, 0x07, 0x16, 0x07, 0x07, 0x07, 0x07, 0x04, -/* 0x38 -SBS -IT -RFF -CU3 DC4 NAK ---- SUB */ - 0x07, 0x07, 0x07, 0x07, 0x14, 0x15, 0x07, 0x1A, -/* 0x40 SP RSP ä ---- */ - 0x20, 0xFF, 0x83, 0x84, 0x85, 0xA0, 0x07, 0x86, -/* 0x48 . < ( + | */ - 0x87, 0xA4, 0x9B, 0x2E, 0x3C, 0x28, 0x2B, 0x7C, -/* 0x50 & ---- */ - 0x26, 0x82, 0x88, 0x89, 0x8A, 0xA1, 0x8C, 0x07, -/* 0x58 ß ! $ * ) ; */ - 0x8D, 0xE1, 0x21, 0x24, 0x2A, 0x29, 0x3B, 0xAA, -/* 0x60 - / ---- Ä ---- ---- ---- */ - 0x2D, 0x2F, 0x07, 0x8E, 0x07, 0x07, 0x07, 0x8F, -/* 0x68 ---- , % _ > ? */ - 0x80, 0xA5, 0x07, 0x2C, 0x25, 0x5F, 0x3E, 0x3F, -/* 0x70 --- ---- ---- ---- ---- ---- ---- */ - 0x07, 0x90, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07, -/* 0x78 * ` : # @ ' = " */ - 0x70, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22, -/* 0x80 * a b c d e f g */ - 0x07, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67, -/* 0x88 h i ---- ---- ---- */ - 0x68, 0x69, 0xAE, 0xAF, 0x07, 0x07, 0x07, 0xF1, -/* 0x90 ° j k l m n o p */ - 0xF8, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70, -/* 0x98 q r ---- ---- */ - 0x71, 0x72, 0xA6, 0xA7, 0x91, 0x07, 0x92, 0x07, -/* 0xA0 ~ s t u v w x */ - 0xE6, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, -/* 0xA8 y z ---- ---- ---- ---- */ - 0x79, 0x7A, 0xAD, 0xAB, 0x07, 0x07, 0x07, 0x07, -/* 0xB0 ^ ---- § ---- */ - 0x5E, 0x9C, 0x9D, 0xFA, 0x07, 0x07, 0x07, 0xAC, -/* 0xB8 ---- [ ] ---- ---- ---- ---- */ - 0xAB, 0x07, 0x5B, 0x5D, 0x07, 0x07, 0x07, 0x07, -/* 0xC0 { A B C D E F G */ - 0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, -/* 0xC8 H I ---- ö ---- */ - 0x48, 0x49, 0x07, 0x93, 0x94, 0x95, 0xA2, 0x07, -/* 0xD0 } J K L M N O P */ - 0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50, -/* 0xD8 Q R ---- ü */ - 0x51, 0x52, 0x07, 0x96, 0x81, 0x97, 0xA3, 0x98, -/* 0xE0 \ S T U V W X */ - 0x5C, 0xF6, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, -/* 0xE8 Y Z ---- Ö ---- ---- ---- */ - 0x59, 0x5A, 0xFD, 0x07, 0x99, 0x07, 0x07, 0x07, -/* 0xF0 0 1 2 3 4 5 6 7 */ - 0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, -/* 0xF8 8 9 ---- ---- Ü ---- ---- ---- */ - 0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07 -}; +/* Convert 'ebcdic' table from code page 037 to code page 500 if necessary */ +void ebcdic_update_table(void) +{ + if (!is_zvm()) { + ebcdic[74] = 0x5B; /* ¢ -> [ */ + ebcdic[79] = 0x21; /* | -> ! */ + ebcdic[90] = 0x5D; /* ! -> ] */ + ebcdic[95] = 0x5E; /* ¬ -> ^ */ + ebcdic[176] = 0xA2; /* ^ -> ¢ */ + ebcdic[186] = 0xAC; /* [ -> ¬ */ + ebcdic[187] = 0x7C; /* ] -> | */ + } +} void ebcdic_to_ascii(unsigned char *target, const unsigned char *source, unsigned int l) { - unsigned char *ebc; unsigned int i; - ebc = is_zvm() ? ebcdic_037 : ebcdic_500; for (i = 0; i < l; i++) - target[i] = ebc[source[i]]; + target[i] = ebcdic[source[i]]; } diff --git a/zipl/boot/ebcdic_conv.h b/zipl/boot/ebcdic_conv.h index af7e726d..c9e8ff29 100644 --- a/zipl/boot/ebcdic_conv.h +++ b/zipl/boot/ebcdic_conv.h @@ -14,6 +14,7 @@ #ifndef __ASSEMBLER__ +void ebcdic_update_table(void); void ebcdic_to_ascii(unsigned char *target, const unsigned char *source, unsigned int l); diff --git a/zipl/boot/stage3.c b/zipl/boot/stage3.c index 0207cf23..18f30e29 100644 --- a/zipl/boot/stage3.c +++ b/zipl/boot/stage3.c @@ -507,6 +507,8 @@ void start(void) if (secure_boot_enabled()) verify_secure_boot(); + ebcdic_update_table(); + /* * cut the kernel header */