Changeset 810a36f in mainline for boot/generic

Timestamp:

2017-10-24T05:29:08Z (8 years ago)

Author:

jzr <zarevucky.jiri@…>

Branches:

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

Children:

b1eb7ef

Parents:

c8fbbe7 (diff), 673ea28 (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 branch 'types'.

Location:

boot/generic

Files:

• include/stddef.h (modified) (1 diff)
• include/stdint.h (modified) (1 diff)
• src/printf_core.c (modified) (3 diffs)
• src/str.c (modified) (1 diff)

boot/generic/include/stddef.h

@@ -33 +33 @@
 #define BOOT_STDDEF_H_
 
-#include <arch/common.h>
 #include <arch/types.h>
 
-#define NULL  ((void *) 0)
+#include <_bits/NULL.h>
 
 #endif

boot/generic/include/stdint.h

@@ -33 +33 @@
 #define BOOT_STDINT_H_
 
-#include <arch/common.h>
 #include <arch/types.h>
-
-#define INT8_MIN  INT8_C(0x80)
-#define INT8_MAX  INT8_C(0x7F)
-
-#define UINT8_MIN  UINT8_C(0)
-#define UINT8_MAX  UINT8_C(0xFF)
-
-#define INT16_MIN  INT16_C(0x8000)
-#define INT16_MAX  INT16_C(0x7FFF)
-
-#define UINT16_MIN  UINT16_C(0)
-#define UINT16_MAX  UINT16_C(0xFFFF)
-
-#define INT32_MIN  INT32_C(0x80000000)
-#define INT32_MAX  INT32_C(0x7FFFFFFF)
-
-#define UINT32_MIN  UINT32_C(0)
-#define UINT32_MAX  UINT32_C(0xFFFFFFFF)
-
-#define INT64_MIN  INT64_C(0x8000000000000000)
-#define INT64_MAX  INT64_C(0x7FFFFFFFFFFFFFFF)
-
-#define UINT64_MIN  UINT64_C(0)
-#define UINT64_MAX  UINT64_C(0xFFFFFFFFFFFFFFFF)
 
 #endif

boot/generic/src/printf_core.c

@@ -101 +101 @@
         PrintfQualifierLongLong,
         PrintfQualifierPointer,
-        PrintfQualifierSize
+        PrintfQualifierSize,
+        PrintfQualifierMax
 } qualifier_t;
 
@@ -643 +644 @@
                                 uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
                                 break;
+                        case 'j':
+                                qualifier = PrintfQualifierMax;
+                                i = nxt;
+                                uc = str_decode(fmt, &nxt, STR_NO_LIMIT);
+                                break;
                         default:
                                 /* Default type */
@@ -759 +765 @@
                                 number = (uint64_t) va_arg(ap, size_t);
                                 break;
+                        case PrintfQualifierMax:
+                                size = sizeof(uintmax_t);
+                                number = (uint64_t) va_arg(ap, uintmax_t);
+                                break;
                         default:
                                 /* Unknown qualifier */

boot/generic/src/str.c

@@ -104 +104 @@
 
 /** Check the condition if wchar_t is signed */
-#ifdef WCHAR_IS_UNSIGNED
+#ifdef __WCHAR_UNSIGNED__
         #define WCHAR_SIGNED_CHECK(cond)  (true)
 #else