Changeset bd48f4c in mainline for boot

Timestamp:

2010-07-12T10:53:30Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd11d3e

Parents:

c40e6ef (diff), bee2d4c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

Location:

boot

Files:

• Makefile.empty (moved) (moved from kernel/arch/arm32/src/panic.S ) (2 diffs)
• arch/abs32le/Makefile.inc (moved) (moved from kernel/arch/ia32/src/debug/panic.s ) (2 diffs)
• arch/ia64/src/asm.S (modified) (1 diff)
• genarch/src/multiplication.c (modified) (5 diffs)
• generic/include/stdint.h (moved) (moved from uspace/lib/c/arch/mips32/include/limits.h ) (1 diff)
• generic/include/typedefs.h (modified) (1 diff)

boot/Makefile.empty

@@ -1 +1 @@
 #
-# Copyright (c) 2007 Michal Kebrt
+# Copyright (c) 2010 Martin Decky
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-.text
+.PHONY: all clean
 
-.global panic_printf
+include Makefile.common
 
-panic_printf:
-        bl printf
-        bl cpu_halt
+all:
+
+clean:

boot/arch/abs32le/Makefile.inc

@@ -1 +1 @@
 #
-# Copyright (c) 2001-2004 Jakub Jermar
+# Copyright (c) 2010 Martin Decky
 # All rights reserved.
 #
@@ -27 +27 @@
 #
 
-.text
-.global panic_printf
-
-panic_printf:
-        movl $halt, (%esp)      # fake stack to make printf return to halt
-        jmp printf
+BOOT_OUTPUT =
+RAW =
+JOB =
+MAP =
+PREBUILD =
+BUILD = Makefile.empty

boot/arch/ia64/src/asm.S

@@ -113 +113 @@
 jump_to_kernel:
         alloc loc0 = ar.pfs, 1, 1, 0, 0
-        mov r1 = in0 ;;                 # Pass bootinfo address
+        mov r2 = in0 ;;                 # Pass bootinfo address
         movl r8 = KERNEL_ADDRESS;;
         mov b1 = r8 ;;

boot/genarch/src/multiplication.c

@@ -33 +33 @@
 
 #include <genarch/multiplication.h>
+#include <typedefs.h>
 
-/** Set 1 to return MAX_INT64 or MIN_INT64 on overflow */
+/** Set 1 to return INT64_MAX or INT64_MIN on overflow */
 #ifndef SOFTINT_CHECK_OF
-        #define SOFTINT_CHECK_OF 0
+        #define SOFTINT_CHECK_OF  0
 #endif
-
-#define MAX_UINT16  (0xFFFFu)
-#define MAX_UINT32  (0xFFFFFFFFu)
-#define MAX_INT64   (0x7FFFFFFFFFFFFFFFll)
-#define MIN_INT64   (0x8000000000000000ll)
 
 /** Multiply two integers and return long long as result.
@@ -51 +47 @@
 static unsigned long long mul(unsigned int a, unsigned int b) {
         unsigned int a1 = a >> 16;
-        unsigned int a2 = a & MAX_UINT16;
+        unsigned int a2 = a & UINT16_MAX;
         unsigned int b1 = b >> 16;
-        unsigned int b2 = b & MAX_UINT16;
+        unsigned int b2 = b & UINT16_MAX;
         
         unsigned long long t1 = a1 * b1;
@@ -85 +81 @@
         unsigned long long b1 = b >> 32;
         
-        unsigned long long a2 = a & (MAX_UINT32);
-        unsigned long long b2 = b & (MAX_UINT32);
+        unsigned long long a2 = a & (UINT32_MAX);
+        unsigned long long b2 = b & (UINT32_MAX);
         
         if (SOFTINT_CHECK_OF && (a1 != 0) && (b1 != 0)) {
                 /* Error (overflow) */
-                return (neg ? MIN_INT64 : MAX_INT64);
+                return (neg ? INT64_MIN : INT64_MAX);
         }
         
@@ -98 +94 @@
         unsigned long long t1 = mul(a1, b2) + mul(b1, a2);
         
-        if ((SOFTINT_CHECK_OF) && (t1 > MAX_UINT32)) {
+        if ((SOFTINT_CHECK_OF) && (t1 > UINT32_MAX)) {
                 /* Error (overflow) */
-                return (neg ? MIN_INT64 : MAX_INT64);
+                return (neg ? INT64_MIN : INT64_MAX);
         }
         
@@ -112 +108 @@
         if ((SOFTINT_CHECK_OF) && ((t2 < t1) || (t2 & (1ull << 63)))) {
                 /* Error (overflow) */
-                return (neg ? MIN_INT64 : MAX_INT64);
+                return (neg ? INT64_MIN : INT64_MAX);
         }
         

boot/generic/include/stdint.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcmips32
- * @{
- */
 /** @file
- * @ingroup libcmips32eb
  */
 
-#ifndef LIBC_mips32__LIMITS_H_
-#define LIBC_mips32__LIMITS_H_
+#ifndef BOOT_STDINT_H_
+#define BOOT_STDINT_H_
 
-#define LONG_MIN MIN_INT32
-#define LONG_MAX MAX_INT32
-#define ULONG_MIN MIN_UINT32
-#define ULONG_MAX MAX_UINT32
+#define INT8_MIN  (0x80)
+#define INT8_MAX  (0x7F)
 
-#define SIZE_MIN MIN_UINT32
-#define SIZE_MAX MAX_UINT32
-#define SSIZE_MIN MIN_INT32
-#define SSIZE_MAX MAX_INT32
+#define UINT8_MIN  (0u)
+#define UINT8_MAX  (0xFFu)
+
+#define INT16_MIN  (0x8000)
+#define INT16_MAX  (0x7FFF)
+
+#define UINT16_MIN  (0u)
+#define UINT16_MAX  (0xFFFFu)
+
+#define INT32_MIN  (0x80000000l)
+#define INT32_MAX  (0x7FFFFFFFl)
+
+#define UINT32_MIN  (0ul)
+#define UINT32_MAX  (0xFFFFFFFFul)
+
+#define INT64_MIN  (0x8000000000000000ll)
+#define INT64_MAX  (0x7FFFFFFFFFFFFFFFll)
+
+#define UINT64_MIN  (0ull)
+#define UINT64_MAX  (0xFFFFFFFFFFFFFFFFull)
 
 #endif

boot/generic/include/typedefs.h

@@ -33 +33 @@
 #define BOOT_TYPEDEFS_H_
 
+#include <stdint.h>
 #include <arch/common.h>
 #include <arch/types.h>