De-inline extract_number and move it back into cborparser.c

This function wasn't getting inlined anyway, might as well make it have
one canonical copy and make that get called.

Signed-off-by: Thiago Macieira <[email protected]>

Author: thiagomacieira

src/cborencoder_close_container_checked.c

@@ -31,7 +31,6 @@
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
-#include "extract_number_p.h"
 
 #include <assert.h>
 
@@ -66,7 +65,7 @@ CborError cbor_encoder_close_container_checked(CborEncoder *encoder, const CborE
 
     /* check what the original length was */
     uint64_t actually_added;
-    err = extract_number(&ptr, encoder->data.ptr, &actually_added);
+    err = _cbor_value_extract_number(&ptr, encoder->data.ptr, &actually_added);
     if (err)
         return err;
 

src/cborinternal_p.h

@@ -25,6 +25,12 @@
 #ifndef CBORINTERNAL_P_H
 #define CBORINTERNAL_P_H
 
+#include "compilersupport_p.h"
+
+#ifndef CBOR_INTERNAL_API
+#  define CBOR_INTERNAL_API
+#endif
+
 /*
  * CBOR Major types
  * Encoded in the high 3 bits of the descriptor byte
@@ -73,4 +79,6 @@ enum {
     BreakByte               = (unsigned)Break | (SimpleTypesType << MajorTypeShift)
 };
 
+CBOR_INTERNAL_API CBOR_INTERNAL_API_CC CborError _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len);
+
 #endif /* CBORINTERNAL_P_H */

src/cborparser.c

@@ -31,7 +31,6 @@
 #include "cbor.h"
 #include "cborinternal_p.h"
 #include "compilersupport_p.h"
-#include "extract_number_p.h"
 
 #include <assert.h>
 #include <string.h>
@@ -146,10 +145,58 @@
  * \endif
  */
 
+static inline uint16_t get16(const uint8_t *ptr)
+{
+    uint16_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohs(result);
+}
+
+static inline uint32_t get32(const uint8_t *ptr)
+{
+    uint32_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohl(result);
+}
+
+static inline uint64_t get64(const uint8_t *ptr)
+{
+    uint64_t result;
+    memcpy(&result, ptr, sizeof(result));
+    return cbor_ntohll(result);
+}
+
+CborError _cbor_value_extract_number(const uint8_t **ptr, const uint8_t *end, uint64_t *len)
+{
+    uint8_t additional_information = **ptr & SmallValueMask;
+    ++*ptr;
+    if (additional_information < Value8Bit) {
+        *len = additional_information;
+        return CborNoError;
+    }
+    if (unlikely(additional_information > Value64Bit))
+        return CborErrorIllegalNumber;
+
+    size_t bytesNeeded = (size_t)(1 << (additional_information - Value8Bit));
+    if (unlikely(bytesNeeded > (size_t)(end - *ptr))) {
+        return CborErrorUnexpectedEOF;
+    } else if (bytesNeeded == 1) {
+        *len = (uint8_t)(*ptr)[0];
+    } else if (bytesNeeded == 2) {
+        *len = get16(*ptr);
+    } else if (bytesNeeded == 4) {
+        *len = get32(*ptr);
+    } else {
+        *len = get64(*ptr);
+    }
+    *ptr += bytesNeeded;
+    return CborNoError;
+}
+
 static CborError extract_length(const CborParser *parser, const uint8_t **ptr, size_t *len)
 {
     uint64_t v;
-    CborError err = extract_number(ptr, parser->end, &v);
+    CborError err = _cbor_value_extract_number(ptr, parser->end, &v);
     if (err) {
         *len = 0;
         return err;
@@ -275,7 +322,7 @@ static CborError preparse_next_value(CborValue *it)
 static CborError advance_internal(CborValue *it)
 {
     uint64_t length;
-    CborError err = extract_number(&it->ptr, it->parser->end, &length);
+    CborError err = _cbor_value_extract_number(&it->ptr, it->parser->end, &length);
     assert(err == CborNoError);
 
     if (it->type == CborByteStringType || it->type == CborTextStringType) {
@@ -519,7 +566,7 @@ CborError cbor_value_enter_container(const CborValue *it, CborValue *recursed)
         ++recursed->ptr;
     } else {
         uint64_t len;
-        err = extract_number(&recursed->ptr, recursed->parser->end, &len);
+        err = _cbor_value_extract_number(&recursed->ptr, recursed->parser->end, &len);
         assert(err == CborNoError);
 
         recursed->remaining = (uint32_t)len;

src/compilersupport_p.h

@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 Intel Corporation
+** Copyright (C) 2017 Intel Corporation
 **
 ** Permission is hereby granted, free of charge, to any person obtaining a copy
 ** of this software and associated documentation files (the "Software"), to deal
@@ -77,6 +77,14 @@
 #endif
 #define DBL_DECIMAL_DIG_STR     STRINGIFY(DBL_DECIMAL_DIG)
 
+#if defined(__GNUC__) && defined(__i386__)
+#  define CBOR_INTERNAL_API_CC          __attribute__((regparm(3)))
+#elif defined(_MSC_VER) && defined(_M_IX86)
+#  define CBOR_INTERNAL_API_CC          __fastcall
+#else
+#  define CBOR_INTERNAL_API_CC
+#endif
+
 #ifndef __has_builtin
 #  define __has_builtin(x)  0
 #endif