WebSVN – HelenOS – Path Comparison – / – /trunk/kernel/ Rev 4555 and /trunk/kernel/ Rev 4556

Ignore whitespace Rev 4555 → Rev 4556

 /trunk/kernel/generic/include/byteorder.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup generic
+/** @addtogroup generic
  * @{
  */
 /** @file
 ,48 → 35,47
 #ifndef KERN_BYTEORDER_H_
 #define KERN_BYTEORDER_H_
-#include <arch/byteorder.h>
 #include <arch/types.h>
-#if !(defined(ARCH_IS_BIG_ENDIAN) ^ defined(ARCH_IS_LITTLE_ENDIAN))
-#error The architecture must be either big-endian or little-endian.
+#if !(defined(__BE__) ^ defined(__LE__))
+    #error The architecture must be either big-endian or little-endian.
 #endif
-#ifdef ARCH_IS_BIG_ENDIAN
+#ifdef __BE__
-#define uint16_t_le2host(n)     uint16_t_byteorder_swap(n)
-#define uint32_t_le2host(n)     uint32_t_byteorder_swap(n)
-#define uint64_t_le2host(n)     uint64_t_byteorder_swap(n)
+#define uint16_t_le2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_le2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_le2host(n)  (uint64_t_byteorder_swap(n))
-#define uint16_t_be2host(n)     (n)
-#define uint32_t_be2host(n)     (n)
-#define uint64_t_be2host(n)     (n)
+#define uint16_t_be2host(n)  (n)
+#define uint32_t_be2host(n)  (n)
+#define uint64_t_be2host(n)  (n)
-#define host2uint16_t_le(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_le(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_le(n)     uint64_t_byteorder_swap(n)
+#define host2uint16_t_le(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_le(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_le(n)  (uint64_t_byteorder_swap(n))
-#define host2uint16_t_be(n)     (n)
-#define host2uint32_t_be(n)     (n)
-#define host2uint64_t_be(n)     (n)
+#define host2uint16_t_be(n)  (n)
+#define host2uint32_t_be(n)  (n)
+#define host2uint64_t_be(n)  (n)
 #else
-#define uint16_t_le2host(n)     (n)
-#define uint32_t_le2host(n)     (n)
-#define uint64_t_le2host(n)     (n)
+#define uint16_t_le2host(n)  (n)
+#define uint32_t_le2host(n)  (n)
+#define uint64_t_le2host(n)  (n)
-#define uint16_t_be2host(n)     uint16_t_byteorder_swap(n)
-#define uint32_t_be2host(n)     uint32_t_byteorder_swap(n)
-#define uint64_t_be2host(n)     uint64_t_byteorder_swap(n)
+#define uint16_t_be2host(n)  (uint16_t_byteorder_swap(n))
+#define uint32_t_be2host(n)  (uint32_t_byteorder_swap(n))
+#define uint64_t_be2host(n)  (uint64_t_byteorder_swap(n))
-#define host2uint16_t_le(n)     (n)
-#define host2uint32_t_le(n)     (n)
-#define host2uint64_t_le(n)     (n)
+#define host2uint16_t_le(n)  (n)
+#define host2uint32_t_le(n)  (n)
+#define host2uint64_t_le(n)  (n)
-#define host2uint16_t_be(n)     uint16_t_byteorder_swap(n)
-#define host2uint32_t_be(n)     uint32_t_byteorder_swap(n)
-#define host2uint64_t_be(n)     uint64_t_byteorder_swap(n)
+#define host2uint16_t_be(n)  (uint16_t_byteorder_swap(n))
+#define host2uint32_t_be(n)  (uint32_t_byteorder_swap(n))
+#define host2uint64_t_be(n)  (uint64_t_byteorder_swap(n))
 #endif

 /trunk/kernel/generic/include/string.h
 ,8 → 57,6
 #define U_CURSOR       0x2588
-#define U_BOM          0xfeff
 /**< No size limit constant */
 #define STR_NO_LIMIT  ((size_t) -1)

 /trunk/kernel/generic/src/printf/printf_core.c
 ,9 → 302,6
     if (str == NULL)
         return printf_putstr(nullstr, ps);
-    if (*str == U_BOM)
-        str++;
     /* Print leading spaces. */
     size_t strw = wstr_length(str);
     if (precision == 0)

 /trunk/kernel/Makefile
 ,12 → 44,12
 ## Common compiler flags
 #
-DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)"
+DEFS = -DKERNEL -DRELEASE=$(RELEASE) "-DNAME=$(NAME)" -D__$(BITS)_BITS__ -D__$(ENDIANESS)__
 GCC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
-    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32 -finput-charset=UTF-8 \
-    -fno-builtin -Wall -Wextra -Wno-unused-parameter -Wmissing-prototypes -Werror \
-    -nostdlib -nostdinc -pipe
+    -fexec-charset=UTF-8 -fwide-exec-charset=UTF-32$(ENDIANESS) \
+    -finput-charset=UTF-8 -fno-builtin -Wall -Wextra -Wno-unused-parameter \
+    -Wmissing-prototypes -Werror -nostdlib -nostdinc -pipe
 ICC_CFLAGS = -I$(INCLUDES) -O$(OPTIMIZATION) -imacros ../config.h \
     -fno-builtin -Wall -Wmissing-prototypes -Werror \

/trunk/kernel/arch/sparc64/include/byteorder.h
File deleted

 /trunk/kernel/arch/sparc64/Makefile.inc
 ,7 → 40,8
 LFLAGS += -no-check-sections -N
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = BE
 ifeq ($(PROCESSOR),us)
     DEFS += -DUS

/trunk/kernel/arch/ia64/include/byteorder.h
File deleted

 /trunk/kernel/arch/ia64/Makefile.inc
 ,7 → 41,8
 LFLAGS += -EL
 AFLAGS += -mconstant-gp
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = LE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/start.S \

/trunk/kernel/arch/arm32/include/byteorder.h
File deleted

 /trunk/kernel/arch/arm32/Makefile.inc
 ,7 → 39,8
 GCC_CFLAGS += -fno-zero-initialized-in-bss
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = LE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/start.S \

/trunk/kernel/arch/ppc32/include/byteorder.h
File deleted

 /trunk/kernel/arch/ppc32/Makefile.inc
 ,7 → 39,8
 AFLAGS += -a32
 LFLAGS += -no-check-sections -N
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = BE
 ARCH_SOURCES = \
     arch/$(KARCH)/src/context.S \

/trunk/kernel/arch/amd64/include/byteorder.h
File deleted

 /trunk/kernel/arch/amd64/Makefile.inc
 ,7 → 41,8
 ICC_CFLAGS += $(CMN1)
 SUNCC_CFLAGS += -m64 -xmodel=kernel
-DEFS += -D__64_BITS__
+BITS = 64
+ENDIANESS = LE
 ## Accepted CPUs
 #

/trunk/kernel/arch/mips32/include/byteorder.h
File deleted

 /trunk/kernel/arch/mips32/include/elf.h
 ,7 → 26,7
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
-/** @addtogroup mips32
+/** @addtogroup mips32
  * @{
  */
 /** @file
 ,17 → 35,15
 #ifndef KERN_mips32_ELF_H_
 #define KERN_mips32_ELF_H_
-#include <byteorder.h>
+#define ELF_MACHINE  EM_MIPS
-#define ELF_MACHINE     EM_MIPS
-#ifdef ARCH_IS_BIG_ENDIAN
-#  define ELF_DATA_ENCODING ELFDATA2MSB
+#ifdef __BE__
+    #define ELF_DATA_ENCODING  ELFDATA2MSB
 #else
-#  define ELF_DATA_ENCODING ELFDATA2LSB
+    #define ELF_DATA_ENCODING  ELFDATA2LSB
 #endif
-#define ELF_CLASS       ELFCLASS32
+#define ELF_CLASS  ELFCLASS32
 #endif

 /trunk/kernel/arch/mips32/Makefile.inc
 ,7 → 36,7
 GCC_CFLAGS += -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mips3
-DEFS += -D__32_BITS__
+BITS = 32
 ## Accepted MACHINEs
 #
 ,15 → 43,18
 ifeq ($(MACHINE),lgxemul)
     BFD_NAME = elf32-tradlittlemips
+    ENDIANESS = LE
 endif
 ifeq ($(MACHINE),bgxemul)
     BFD_NAME = elf32-tradbigmips
     TOOLCHAIN_DIR = $(CROSS_PREFIX)/mips
     TARGET = mips-linux-gnu
-    GCC_CFLAGS += -DBIG_ENDIAN
+    ENDIANESS = BE
+    GCC_CFLAGS += -D__BE__
 endif
 ifeq ($(MACHINE),msim)
     BFD_NAME = elf32-tradlittlemips
+    ENDIANESS = LE
     GCC_CFLAGS += -mhard-float
 endif

/trunk/kernel/arch/ia32/include/byteorder.h
File deleted

 /trunk/kernel/arch/ia32/Makefile.inc
 ,7 → 35,8
 TARGET = i686-pc-linux-gnu
 TOOLCHAIN_DIR = $(CROSS_PREFIX)/i686
-DEFS += -D__32_BITS__
+BITS = 32
+ENDIANESS = LE
 CMN1 = -m32
 GCC_CFLAGS += $(CMN1)

Subversion Repositories HelenOS

Compare Revisions

Ignore whitespace Rev 4555 → Rev 4556