Commit 40fa5264 authored by Heinz Graalfs's avatar Heinz Graalfs Committed by Christian Borntraeger
Browse files

s390/ebcdic: Move conversion tables to header file 



Move conversion tables to header file.
   - In SCLP line mode processing EBCDIC/ASCII conversion is needed.
   - An additional EBCDIC to ASCII conversion function is added.

Signed-off-by: default avatarHeinz Graalfs <graalfs@linux.vnet.ibm.com>
Reviewed-by: default avatarAlexander Graf <agraf@suse.de>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent c3d9f24a

include/hw/s390x/ebcdic.h

0 → 100644
+104 −0
Original line number Diff line number Diff line 
/*

 * EBCDIC/ASCII conversion Support

 *

 * Copyright (c) 2011 Alexander Graf

 * Copyright IBM, Corp. 2013

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or (at your

 * option) any later version.  See the COPYING file in the top-level directory.

 *

 */



#ifndef EBCDIC_H_

#define EBCDIC_H_



/* EBCDIC handling */

static const uint8_t ebcdic2ascii[] = {

    0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F,

    0x07, 0x07, 0x07, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

    0x10, 0x11, 0x12, 0x13, 0x07, 0x0A, 0x08, 0x07,

    0x18, 0x19, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

    0x07, 0x07, 0x1C, 0x07, 0x07, 0x0A, 0x17, 0x1B,

    0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07,

    0x07, 0x07, 0x16, 0x07, 0x07, 0x07, 0x07, 0x04,

    0x07, 0x07, 0x07, 0x07, 0x14, 0x15, 0x07, 0x1A,

    0x20, 0xFF, 0x83, 0x84, 0x85, 0xA0, 0x07, 0x86,

    0x87, 0xA4, 0x5B, 0x2E, 0x3C, 0x28, 0x2B, 0x21,

    0x26, 0x82, 0x88, 0x89, 0x8A, 0xA1, 0x8C, 0x07,

    0x8D, 0xE1, 0x5D, 0x24, 0x2A, 0x29, 0x3B, 0x5E,

    0x2D, 0x2F, 0x07, 0x8E, 0x07, 0x07, 0x07, 0x8F,

    0x80, 0xA5, 0x07, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,

    0x07, 0x90, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

    0x70, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,

    0x07, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,

    0x68, 0x69, 0xAE, 0xAF, 0x07, 0x07, 0x07, 0xF1,

    0xF8, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70,

    0x71, 0x72, 0xA6, 0xA7, 0x91, 0x07, 0x92, 0x07,

    0xE6, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,

    0x79, 0x7A, 0xAD, 0xAB, 0x07, 0x07, 0x07, 0x07,

    0x9B, 0x9C, 0x9D, 0xFA, 0x07, 0x07, 0x07, 0xAC,

    0xAB, 0x07, 0xAA, 0x7C, 0x07, 0x07, 0x07, 0x07,

    0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,

    0x48, 0x49, 0x07, 0x93, 0x94, 0x95, 0xA2, 0x07,

    0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,

    0x51, 0x52, 0x07, 0x96, 0x81, 0x97, 0xA3, 0x98,

    0x5C, 0xF6, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

    0x59, 0x5A, 0xFD, 0x07, 0x99, 0x07, 0x07, 0x07,

    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,

    0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07,

};



static const uint8_t ascii2ebcdic[] = {

    0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F,

    0x16, 0x05, 0x15, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

    0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26,

    0x18, 0x19, 0x3F, 0x27, 0x22, 0x1D, 0x1E, 0x1F,

    0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D,

    0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61,

    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,

    0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F,

    0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,

    0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6,

    0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6,

    0xE7, 0xE8, 0xE9, 0xBA, 0xE0, 0xBB, 0xB0, 0x6D,

    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,

    0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,

    0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6,

    0xA7, 0xA8, 0xA9, 0xC0, 0x4F, 0xD0, 0xA1, 0x07,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x59, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x90, 0x3F, 0x3F, 0x3F, 0x3F, 0xEA, 0x3F, 0xFF

};



static inline void ebcdic_put(uint8_t *p, const char *ascii, int len)

{

    int i;



    for (i = 0; i < len; i++) {

        p[i] = ascii2ebcdic[(uint8_t)ascii[i]];

    }

}



static inline void ascii_put(uint8_t *p, const char *ebcdic, int len)

{

    int i;



    for (i = 0; i < len; i++) {

        p[i] = ebcdic2ascii[(uint8_t)ebcdic[i]];

    }

}



#endif /* EBCDIC_H_ */

target-s390x/misc_helper.c

+1 −80
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
#include "exec/softmmu_exec.h"

#include "sysemu/cpus.h"

#include "sysemu/sysemu.h"

#include "hw/s390x/ebcdic.h"

#endif



/* #define DEBUG_HELPER */
@@ -72,86 +73,6 @@ void HELPER(exception)(CPUS390XState *env, uint32_t excp) 


#ifndef CONFIG_USER_ONLY



/* EBCDIC handling */

static const uint8_t ebcdic2ascii[] = {

    0x00, 0x01, 0x02, 0x03, 0x07, 0x09, 0x07, 0x7F,

    0x07, 0x07, 0x07, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

    0x10, 0x11, 0x12, 0x13, 0x07, 0x0A, 0x08, 0x07,

    0x18, 0x19, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

    0x07, 0x07, 0x1C, 0x07, 0x07, 0x0A, 0x17, 0x1B,

    0x07, 0x07, 0x07, 0x07, 0x07, 0x05, 0x06, 0x07,

    0x07, 0x07, 0x16, 0x07, 0x07, 0x07, 0x07, 0x04,

    0x07, 0x07, 0x07, 0x07, 0x14, 0x15, 0x07, 0x1A,

    0x20, 0xFF, 0x83, 0x84, 0x85, 0xA0, 0x07, 0x86,

    0x87, 0xA4, 0x5B, 0x2E, 0x3C, 0x28, 0x2B, 0x21,

    0x26, 0x82, 0x88, 0x89, 0x8A, 0xA1, 0x8C, 0x07,

    0x8D, 0xE1, 0x5D, 0x24, 0x2A, 0x29, 0x3B, 0x5E,

    0x2D, 0x2F, 0x07, 0x8E, 0x07, 0x07, 0x07, 0x8F,

    0x80, 0xA5, 0x07, 0x2C, 0x25, 0x5F, 0x3E, 0x3F,

    0x07, 0x90, 0x07, 0x07, 0x07, 0x07, 0x07, 0x07,

    0x70, 0x60, 0x3A, 0x23, 0x40, 0x27, 0x3D, 0x22,

    0x07, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,

    0x68, 0x69, 0xAE, 0xAF, 0x07, 0x07, 0x07, 0xF1,

    0xF8, 0x6A, 0x6B, 0x6C, 0x6D, 0x6E, 0x6F, 0x70,

    0x71, 0x72, 0xA6, 0xA7, 0x91, 0x07, 0x92, 0x07,

    0xE6, 0x7E, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,

    0x79, 0x7A, 0xAD, 0xAB, 0x07, 0x07, 0x07, 0x07,

    0x9B, 0x9C, 0x9D, 0xFA, 0x07, 0x07, 0x07, 0xAC,

    0xAB, 0x07, 0xAA, 0x7C, 0x07, 0x07, 0x07, 0x07,

    0x7B, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,

    0x48, 0x49, 0x07, 0x93, 0x94, 0x95, 0xA2, 0x07,

    0x7D, 0x4A, 0x4B, 0x4C, 0x4D, 0x4E, 0x4F, 0x50,

    0x51, 0x52, 0x07, 0x96, 0x81, 0x97, 0xA3, 0x98,

    0x5C, 0xF6, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,

    0x59, 0x5A, 0xFD, 0x07, 0x99, 0x07, 0x07, 0x07,

    0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,

    0x38, 0x39, 0x07, 0x07, 0x9A, 0x07, 0x07, 0x07,

};



static const uint8_t ascii2ebcdic[] = {

    0x00, 0x01, 0x02, 0x03, 0x37, 0x2D, 0x2E, 0x2F,

    0x16, 0x05, 0x15, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

    0x10, 0x11, 0x12, 0x13, 0x3C, 0x3D, 0x32, 0x26,

    0x18, 0x19, 0x3F, 0x27, 0x22, 0x1D, 0x1E, 0x1F,

    0x40, 0x5A, 0x7F, 0x7B, 0x5B, 0x6C, 0x50, 0x7D,

    0x4D, 0x5D, 0x5C, 0x4E, 0x6B, 0x60, 0x4B, 0x61,

    0xF0, 0xF1, 0xF2, 0xF3, 0xF4, 0xF5, 0xF6, 0xF7,

    0xF8, 0xF9, 0x7A, 0x5E, 0x4C, 0x7E, 0x6E, 0x6F,

    0x7C, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7,

    0xC8, 0xC9, 0xD1, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6,

    0xD7, 0xD8, 0xD9, 0xE2, 0xE3, 0xE4, 0xE5, 0xE6,

    0xE7, 0xE8, 0xE9, 0xBA, 0xE0, 0xBB, 0xB0, 0x6D,

    0x79, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,

    0x88, 0x89, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96,

    0x97, 0x98, 0x99, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6,

    0xA7, 0xA8, 0xA9, 0xC0, 0x4F, 0xD0, 0xA1, 0x07,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x59, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F, 0x3F,

    0x90, 0x3F, 0x3F, 0x3F, 0x3F, 0xEA, 0x3F, 0xFF

};



static inline void ebcdic_put(uint8_t *p, const char *ascii, int len)

{

    int i;



    for (i = 0; i < len; i++) {

        p[i] = ascii2ebcdic[(uint8_t)ascii[i]];

    }

}



void program_interrupt(CPUS390XState *env, uint32_t code, int ilen)

{

    qemu_log_mask(CPU_LOG_INT, "program interrupt at %#" PRIx64 "\n",