From 5a071c190709b76dc5ff0fc525fe1fc260e08ef9 Mon Sep 17 00:00:00 2001 From: John Keiser Date: Tue, 17 Mar 2020 14:11:21 -0700 Subject: [PATCH] Remove TARGET_FALLBACK --- include/simdjson/portability.h | 1 - src/fallback/bitmanipulation.h | 2 -- src/fallback/implementation.h | 2 -- src/fallback/numberparsing.h | 2 -- src/fallback/stage1_find_marks.h | 4 ---- src/fallback/stage2_build_tape.h | 2 -- src/fallback/stringparsing.h | 2 -- 7 files changed, 15 deletions(-) diff --git a/include/simdjson/portability.h b/include/simdjson/portability.h index 2f8072b2..057fb2f9 100644 --- a/include/simdjson/portability.h +++ b/include/simdjson/portability.h @@ -70,7 +70,6 @@ #endif // under GCC and CLANG, we use these two macros -#define TARGET_FALLBACK TARGET_REGION("") #define TARGET_HASWELL TARGET_REGION("avx2,bmi,pclmul,lzcnt") #define TARGET_WESTMERE TARGET_REGION("sse4.2,pclmul") #define TARGET_ARM64 diff --git a/src/fallback/bitmanipulation.h b/src/fallback/bitmanipulation.h index 85aeead4..6d00c80c 100644 --- a/src/fallback/bitmanipulation.h +++ b/src/fallback/bitmanipulation.h @@ -4,7 +4,6 @@ #include "simdjson.h" #include -TARGET_FALLBACK namespace simdjson::fallback { #ifndef _MSC_VER @@ -60,6 +59,5 @@ really_inline bool mul_overflow(uint64_t value1, uint64_t value2, uint64_t *resu } } // namespace simdjson::fallback -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_BITMANIPULATION_H diff --git a/src/fallback/implementation.h b/src/fallback/implementation.h index 74de3fa3..32e7c9bf 100644 --- a/src/fallback/implementation.h +++ b/src/fallback/implementation.h @@ -4,7 +4,6 @@ #include "simdjson.h" #include "isadetection.h" -TARGET_FALLBACK namespace simdjson::fallback { class implementation final : public simdjson::implementation { @@ -21,6 +20,5 @@ public: }; } // namespace simdjson::fallback -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_IMPLEMENTATION_H \ No newline at end of file diff --git a/src/fallback/numberparsing.h b/src/fallback/numberparsing.h index 3a5be25f..b32e4f05 100644 --- a/src/fallback/numberparsing.h +++ b/src/fallback/numberparsing.h @@ -14,7 +14,6 @@ void found_unsigned_integer(uint64_t result, const uint8_t *buf); void found_float(double result, const uint8_t *buf); #endif -TARGET_FALLBACK namespace simdjson::fallback { static inline uint32_t parse_eight_digits_unrolled(const char *chars) { uint32_t result = 0; @@ -29,6 +28,5 @@ static inline uint32_t parse_eight_digits_unrolled(const char *chars) { #include "generic/numberparsing.h" } // namespace simdjson::fallback -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_NUMBERPARSING_H diff --git a/src/fallback/stage1_find_marks.h b/src/fallback/stage1_find_marks.h index 5674c5b0..51e59895 100644 --- a/src/fallback/stage1_find_marks.h +++ b/src/fallback/stage1_find_marks.h @@ -4,7 +4,6 @@ #include "simdjson.h" #include "fallback/implementation.h" -TARGET_FALLBACK namespace simdjson::fallback::stage1 { class structural_scanner { @@ -141,9 +140,7 @@ private: }; // structural_scanner } // simdjson::fallback::stage1 -UNTARGET_REGION -TARGET_FALLBACK namespace simdjson::fallback { WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, document::parser &parser, bool streaming) const noexcept { @@ -155,6 +152,5 @@ WARN_UNUSED error_code implementation::stage1(const uint8_t *buf, size_t len, do } } // namespace simdjson::fallback -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_STAGE1_FIND_MARKS_H diff --git a/src/fallback/stage2_build_tape.h b/src/fallback/stage2_build_tape.h index 48886d16..41b0c82b 100644 --- a/src/fallback/stage2_build_tape.h +++ b/src/fallback/stage2_build_tape.h @@ -7,7 +7,6 @@ #include "fallback/stringparsing.h" #include "fallback/numberparsing.h" -TARGET_FALLBACK namespace simdjson::fallback { #include "generic/atomparsing.h" @@ -15,6 +14,5 @@ namespace simdjson::fallback { #include "generic/stage2_streaming_build_tape.h" } // namespace simdjson -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_STAGE2_BUILD_TAPE_H diff --git a/src/fallback/stringparsing.h b/src/fallback/stringparsing.h index 1b14ffcd..ac986a79 100644 --- a/src/fallback/stringparsing.h +++ b/src/fallback/stringparsing.h @@ -4,7 +4,6 @@ #include "simdjson.h" #include "jsoncharutils.h" -TARGET_FALLBACK namespace simdjson::fallback { // Holds backslashes and quotes locations. @@ -30,6 +29,5 @@ really_inline backslash_and_quote backslash_and_quote::copy_and_find(const uint8 #include "generic/stringparsing.h" } // namespace simdjson::fallback -UNTARGET_REGION #endif // SIMDJSON_FALLBACK_STRINGPARSING_H