2004-04-04 Yoshinori K. Okuji <okuji@enbug.org>
All symbols prefixed with PUPA_ and pupa_ are renamed to GRUB_ and grub_, respectively. Because the conversion is trivial and mechanical, I omit the details here. Please refer to the CVS if you need more information.
This commit is contained in:
okuji
parent
6a1425510d
commit
4b13b216f4
125 changed files with 6198 additions and 6181 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
* PUPA -- Preliminary Universal Programming Architecture for GRUB
|
||||
* GRUB -- GRand Unified Bootloader
|
||||
* Copyright (C) 2002 Free Software Foundation, Inc.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
|
|
@ -17,125 +17,125 @@
|
|||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||
*/
|
||||
|
||||
#ifndef PUPA_TYPES_HEADER
|
||||
#define PUPA_TYPES_HEADER 1
|
||||
#ifndef GRUB_TYPES_HEADER
|
||||
#define GRUB_TYPES_HEADER 1
|
||||
|
||||
#include <config.h>
|
||||
#include <pupa/cpu/types.h>
|
||||
#include <grub/cpu/types.h>
|
||||
|
||||
#ifdef PUPA_UTIL
|
||||
# define PUPA_CPU_SIZEOF_VOID_P SIZEOF_VOID_P
|
||||
# define PUPA_CPU_SIZEOF_LONG SIZEOF_LONG
|
||||
#ifdef GRUB_UTIL
|
||||
# define GRUB_CPU_SIZEOF_VOID_P SIZEOF_VOID_P
|
||||
# define GRUB_CPU_SIZEOF_LONG SIZEOF_LONG
|
||||
# ifdef WORDS_BIGENDIAN
|
||||
# define PUPA_CPU_WORDS_BIGENDIAN 1
|
||||
# define GRUB_CPU_WORDS_BIGENDIAN 1
|
||||
# else
|
||||
# undef PUPA_CPU_WORDS_BIGENDIAN
|
||||
# undef GRUB_CPU_WORDS_BIGENDIAN
|
||||
# endif
|
||||
#else /* ! PUPA_UTIL */
|
||||
# define PUPA_CPU_SIZEOF_VOID_P PUPA_HOST_SIZEOF_VOID_P
|
||||
# define PUPA_CPU_SIZEOF_LONG PUPA_HOST_SIZEOF_LONG
|
||||
# ifdef PUPA_HOST_WORDS_BIGENDIAN
|
||||
# define PUPA_CPU_WORDS_BIGENDIAN 1
|
||||
#else /* ! GRUB_UTIL */
|
||||
# define GRUB_CPU_SIZEOF_VOID_P GRUB_HOST_SIZEOF_VOID_P
|
||||
# define GRUB_CPU_SIZEOF_LONG GRUB_HOST_SIZEOF_LONG
|
||||
# ifdef GRUB_HOST_WORDS_BIGENDIAN
|
||||
# define GRUB_CPU_WORDS_BIGENDIAN 1
|
||||
# else
|
||||
# undef PUPA_CPU_WORDS_BIGENDIAN
|
||||
# undef GRUB_CPU_WORDS_BIGENDIAN
|
||||
# endif
|
||||
#endif /* ! PUPA_UTIL */
|
||||
#endif /* ! GRUB_UTIL */
|
||||
|
||||
#if PUPA_CPU_SIZEOF_VOID_P != PUPA_CPU_SIZEOF_LONG
|
||||
#if GRUB_CPU_SIZEOF_VOID_P != GRUB_CPU_SIZEOF_LONG
|
||||
# error "This architecture is not supported because sizeof(void *) != sizeof(long)"
|
||||
#endif
|
||||
|
||||
#if PUPA_CPU_SIZEOF_VOID_P != 4 && PUPA_CPU_SIZEOF_VOID_P != 8
|
||||
#if GRUB_CPU_SIZEOF_VOID_P != 4 && GRUB_CPU_SIZEOF_VOID_P != 8
|
||||
# error "This architecture is not supported because sizeof(void *) != 4 and sizeof(void *) != 8"
|
||||
#endif
|
||||
|
||||
/* Define various wide integers. */
|
||||
typedef signed char pupa_int8_t;
|
||||
typedef short pupa_int16_t;
|
||||
typedef int pupa_int32_t;
|
||||
#if PUPA_CPU_SIZEOF_VOID_P == 8
|
||||
typedef long pupa_int64_t;
|
||||
typedef signed char grub_int8_t;
|
||||
typedef short grub_int16_t;
|
||||
typedef int grub_int32_t;
|
||||
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
||||
typedef long grub_int64_t;
|
||||
#else
|
||||
typedef long long pupa_int64_t;
|
||||
typedef long long grub_int64_t;
|
||||
#endif
|
||||
|
||||
typedef unsigned char pupa_uint8_t;
|
||||
typedef unsigned short pupa_uint16_t;
|
||||
typedef unsigned pupa_uint32_t;
|
||||
#if PUPA_CPU_SIZEOF_VOID_P == 8
|
||||
typedef unsigned long pupa_uint64_t;
|
||||
typedef unsigned char grub_uint8_t;
|
||||
typedef unsigned short grub_uint16_t;
|
||||
typedef unsigned grub_uint32_t;
|
||||
#if GRUB_CPU_SIZEOF_VOID_P == 8
|
||||
typedef unsigned long grub_uint64_t;
|
||||
#else
|
||||
typedef unsigned long long pupa_uint64_t;
|
||||
typedef unsigned long long grub_uint64_t;
|
||||
#endif
|
||||
|
||||
/* Misc types. */
|
||||
#if PUPA_HOST_SIZEOF_VOID_P == 8
|
||||
typedef pupa_uint64_t pupa_addr_t;
|
||||
typedef pupa_uint64_t pupa_off_t;
|
||||
typedef pupa_uint64_t pupa_size_t;
|
||||
typedef pupa_int64_t pupa_ssize_t;
|
||||
#if GRUB_HOST_SIZEOF_VOID_P == 8
|
||||
typedef grub_uint64_t grub_addr_t;
|
||||
typedef grub_uint64_t grub_off_t;
|
||||
typedef grub_uint64_t grub_size_t;
|
||||
typedef grub_int64_t grub_ssize_t;
|
||||
#else
|
||||
typedef pupa_uint32_t pupa_addr_t;
|
||||
typedef pupa_uint32_t pupa_off_t;
|
||||
typedef pupa_uint32_t pupa_size_t;
|
||||
typedef pupa_int32_t pupa_ssize_t;
|
||||
typedef grub_uint32_t grub_addr_t;
|
||||
typedef grub_uint32_t grub_off_t;
|
||||
typedef grub_uint32_t grub_size_t;
|
||||
typedef grub_int32_t grub_ssize_t;
|
||||
#endif
|
||||
|
||||
/* Byte-orders. */
|
||||
#define pupa_swap_bytes16(x) \
|
||||
#define grub_swap_bytes16(x) \
|
||||
({ \
|
||||
pupa_uint16_t _x = (x); \
|
||||
(pupa_uint16_t) ((_x << 8) | (_x >> 8)); \
|
||||
grub_uint16_t _x = (x); \
|
||||
(grub_uint16_t) ((_x << 8) | (_x >> 8)); \
|
||||
})
|
||||
|
||||
#define pupa_swap_bytes32(x) \
|
||||
#define grub_swap_bytes32(x) \
|
||||
({ \
|
||||
pupa_uint32_t _x = (x); \
|
||||
(pupa_uint32_t) ((_x << 24) \
|
||||
| ((_x & (pupa_uint32_t) 0xFF00UL) << 8) \
|
||||
| ((_x & (pupa_uint32_t) 0xFF0000UL) >> 8) \
|
||||
grub_uint32_t _x = (x); \
|
||||
(grub_uint32_t) ((_x << 24) \
|
||||
| ((_x & (grub_uint32_t) 0xFF00UL) << 8) \
|
||||
| ((_x & (grub_uint32_t) 0xFF0000UL) >> 8) \
|
||||
| (_x >> 24)); \
|
||||
})
|
||||
|
||||
#define pupa_swap_bytes64(x) \
|
||||
#define grub_swap_bytes64(x) \
|
||||
({ \
|
||||
pupa_uint64_t _x = (x); \
|
||||
(pupa_uint64_t) ((_x << 56) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF00ULL) << 40) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF0000ULL) << 24) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF000000ULL) << 8) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF00000000ULL) >> 8) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF0000000000ULL) >> 24) \
|
||||
| ((_x & (pupa_uint64_t) 0xFF000000000000ULL) >> 40) \
|
||||
grub_uint64_t _x = (x); \
|
||||
(grub_uint64_t) ((_x << 56) \
|
||||
| ((_x & (grub_uint64_t) 0xFF00ULL) << 40) \
|
||||
| ((_x & (grub_uint64_t) 0xFF0000ULL) << 24) \
|
||||
| ((_x & (grub_uint64_t) 0xFF000000ULL) << 8) \
|
||||
| ((_x & (grub_uint64_t) 0xFF00000000ULL) >> 8) \
|
||||
| ((_x & (grub_uint64_t) 0xFF0000000000ULL) >> 24) \
|
||||
| ((_x & (grub_uint64_t) 0xFF000000000000ULL) >> 40) \
|
||||
| (_x >> 56)); \
|
||||
})
|
||||
|
||||
#ifdef PUPA_CPU_WORDS_BIGENDIAN
|
||||
# define pupa_cpu_to_le16(x) pupa_swap_bytes16(x)
|
||||
# define pupa_cpu_to_le32(x) pupa_swap_bytes32(x)
|
||||
# define pupa_cpu_to_le64(x) pupa_swap_bytes64(x)
|
||||
# define pupa_le_to_cpu16(x) pupa_swap_bytes16(x)
|
||||
# define pupa_le_to_cpu32(x) pupa_swap_bytes32(x)
|
||||
# define pupa_le_to_cpu64(x) pupa_swap_bytes64(x)
|
||||
# define pupa_cpu_to_be16(x) ((pupa_uint16_t) (x))
|
||||
# define pupa_cpu_to_be32(x) ((pupa_uint32_t) (x))
|
||||
# define pupa_cpu_to_be64(x) ((pupa_uint64_t) (x))
|
||||
# define pupa_be_to_cpu16(x) ((pupa_uint16_t) (x))
|
||||
# define pupa_be_to_cpu32(x) ((pupa_uint32_t) (x))
|
||||
# define pupa_be_to_cpu64(x) ((pupa_uint64_t) (x))
|
||||
#ifdef GRUB_CPU_WORDS_BIGENDIAN
|
||||
# define grub_cpu_to_le16(x) grub_swap_bytes16(x)
|
||||
# define grub_cpu_to_le32(x) grub_swap_bytes32(x)
|
||||
# define grub_cpu_to_le64(x) grub_swap_bytes64(x)
|
||||
# define grub_le_to_cpu16(x) grub_swap_bytes16(x)
|
||||
# define grub_le_to_cpu32(x) grub_swap_bytes32(x)
|
||||
# define grub_le_to_cpu64(x) grub_swap_bytes64(x)
|
||||
# define grub_cpu_to_be16(x) ((grub_uint16_t) (x))
|
||||
# define grub_cpu_to_be32(x) ((grub_uint32_t) (x))
|
||||
# define grub_cpu_to_be64(x) ((grub_uint64_t) (x))
|
||||
# define grub_be_to_cpu16(x) ((grub_uint16_t) (x))
|
||||
# define grub_be_to_cpu32(x) ((grub_uint32_t) (x))
|
||||
# define grub_be_to_cpu64(x) ((grub_uint64_t) (x))
|
||||
#else /* ! WORDS_BIGENDIAN */
|
||||
# define pupa_cpu_to_le16(x) ((pupa_uint16_t) (x))
|
||||
# define pupa_cpu_to_le32(x) ((pupa_uint32_t) (x))
|
||||
# define pupa_cpu_to_le64(x) ((pupa_uint64_t) (x))
|
||||
# define pupa_le_to_cpu16(x) ((pupa_uint16_t) (x))
|
||||
# define pupa_le_to_cpu32(x) ((pupa_uint32_t) (x))
|
||||
# define pupa_le_to_cpu64(x) ((pupa_uint64_t) (x))
|
||||
# define pupa_cpu_to_be16(x) pupa_swap_bytes16(x)
|
||||
# define pupa_cpu_to_be32(x) pupa_swap_bytes32(x)
|
||||
# define pupa_cpu_to_be64(x) pupa_swap_bytes64(x)
|
||||
# define pupa_be_to_cpu16(x) pupa_swap_bytes16(x)
|
||||
# define pupa_be_to_cpu32(x) pupa_swap_bytes32(x)
|
||||
# define pupa_be_to_cpu64(x) pupa_swap_bytes64(x)
|
||||
# define grub_cpu_to_le16(x) ((grub_uint16_t) (x))
|
||||
# define grub_cpu_to_le32(x) ((grub_uint32_t) (x))
|
||||
# define grub_cpu_to_le64(x) ((grub_uint64_t) (x))
|
||||
# define grub_le_to_cpu16(x) ((grub_uint16_t) (x))
|
||||
# define grub_le_to_cpu32(x) ((grub_uint32_t) (x))
|
||||
# define grub_le_to_cpu64(x) ((grub_uint64_t) (x))
|
||||
# define grub_cpu_to_be16(x) grub_swap_bytes16(x)
|
||||
# define grub_cpu_to_be32(x) grub_swap_bytes32(x)
|
||||
# define grub_cpu_to_be64(x) grub_swap_bytes64(x)
|
||||
# define grub_be_to_cpu16(x) grub_swap_bytes16(x)
|
||||
# define grub_be_to_cpu32(x) grub_swap_bytes32(x)
|
||||
# define grub_be_to_cpu64(x) grub_swap_bytes64(x)
|
||||
#endif /* ! WORDS_BIGENDIAN */
|
||||
|
||||
#endif /* ! PUPA_TYPES_HEADER */
|
||||
#endif /* ! GRUB_TYPES_HEADER */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue