Changeset 282f4724 in mainline

Timestamp:

2006-06-25T21:02:16Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ce8725be

Parents:

7431e867

Message:

Cleanup in the boot infrastructure.
This commit tries to separate generic stuff from mips32 specific stuff.
Other architectures will follow.

Files:

• arch/mips32/loader/Makefile (modified) (1 diff)
• arch/mips32/loader/main.c (modified) (1 diff)
• arch/mips32/loader/msim.c (modified) (1 diff)
• arch/mips32/loader/msim.h (modified) (1 diff)
• arch/mips32/loader/types.h (added)
• generic/printf.c (moved) (moved from arch/mips32/loader/printf.c ) (1 diff)
• generic/printf.h (moved) (moved from arch/mips32/loader/printf.h ) (2 diffs)
• generic/stdarg.h (added)
• generic/types.h (added)

arch/mips32/loader/Makefile

@@ -48 +48 @@
 
 CFLAGS = -nostdinc -nostdlib -fno-builtin -Werror-implicit-function-declaration -Wmissing-prototypes -Werror -O3 -mno-abicalls -G 0 -fno-zero-initialized-in-bss -mhard-float -mips3
-DEFS = 
+DEFS = -I.
 
 SOURCES = \
         main.c \
         msim.c \
-        printf.c \
+        ../../../generic/printf.c \
         asm.S \
         boot.S

arch/mips32/loader/main.c

@@ -28 +28 @@
 
 #include "main.h" 
-#include "printf.h"
+#include "../../../generic/printf.h"
 #include "msim.h"
 #include "asm.h"

arch/mips32/loader/msim.c

@@ -28 +28 @@
  
 #include "msim.h"
-#include "printf.h"
-
+#include "../../../generic/printf.h"
 
 #define MSIM_VIDEORAM            0xB0000000
-
 
 void write(const char *str, const int len)

arch/mips32/loader/msim.h

@@ -30 +30 @@
 #define __MSIM_H__
 
-#define NULL 0
-#define false 0
-#define true 1
-
-typedef __builtin_va_list va_list;
-
-#define va_start(ap, last)              __builtin_va_start(ap, last)
-#define va_arg(ap, type)                __builtin_va_arg(ap, type)
-#define va_end(ap)                      __builtin_va_end(ap)
-
 extern void init(void);
 extern void halt(void);
 
-extern void write(const char *str, const int len);
 extern void *translate(void *addr);
 

generic/printf.c

@@ -28 +28 @@
 
 #include "printf.h"
-#include "msim.h"
+#include "stdarg.h"
+#include <types.h>
+
+typedef char *char_ptr;
 
 static char digits[] = "0123456789abcdef";  /**< Hexadecimal characters */
-
 
 void puts(const char *str)

generic/printf.h

@@ -27 +27 @@
  */
 
-#ifndef __PRINTF_H__
-#define __PRINTF_H__
+#ifndef PRINTF_H__
+#define PRINTF_H__
 
 #define INT8    1
@@ -35 +35 @@
 #define INT64   8
 
-typedef signed char __s8;
+extern void puts(const char *str);
+extern void printf(const char *fmt, ...);
 
-typedef unsigned char __u8;
-typedef unsigned short __u16;
-typedef unsigned int __u32;
-typedef unsigned long long __u64;
-
-typedef __u32 __address;
-typedef __u32 __native;
-
-typedef char *char_ptr;
-
-void puts(const char *str);
-void printf(const char *fmt, ...);
+extern void write(const char *str, const int len);
 
 #endif