commit 3e193f27bad1d014a21d7bcb159f7c2ca8c32466
author Maciej Żenczykowski <maze@google.com> Thu May 18 06:31:37 2023 +0000
committer Cherrypicker Worker <android-build-cherrypicker-worker@google.com> Tue May 23 16:14:41 2023 +0000
tree f747601bab6ef2639eacc5564d79eb127e70cc96
parent 3fafb0cc72def1edfffbbb28a20a79cd1ae4f887

KernelUtils.h - add arch query helpers

see bionic/docs/defines.md:
http://cs/h/android/platform/superproject/+/master:bionic/docs/defines.md?l=57

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
(cherry picked from https://android-review.googlesource.com/q/commit:ea6d35b842ea0d675e2d8fb232a5512bfe79e6ef)
Merged-In: I818da16ad4dd1837ef3cdcc552557119eafaf6af
Change-Id: I818da16ad4dd1837ef3cdcc552557119eafaf6af
Bug: 283523051

common/native/bpf_headers/include/bpf/KernelUtils.h

diff --git a/common/native/bpf_headers/include/bpf/KernelUtils.h b/common/native/bpf_headers/include/bpf/KernelUtils.h
index 3f82deb..865f856 100644
--- a/common/native/bpf_headers/include/bpf/KernelUtils.h
+++ b/common/native/bpf_headers/include/bpf/KernelUtils.h
@@ -48,12 +48,26 @@
 
 // Figure out the bitness of userspace.
 // Trivial and known at compile time.
-static constexpr bool isUserspace64bit() {
-    return sizeof(long) == 8;
+static constexpr bool isUserspace32bit() {
+    return sizeof(void*) == 4;
 }
 
+static constexpr bool isUserspace64bit() {
+    return sizeof(void*) == 8;
+}
+
+#if defined(__LP64__)
+static_assert(isUserspace64bit(), "huh?");
+#elif defined(__ILP32__)
+static_assert(isUserspace32bit(), "huh?");
+#else
+#error "huh?"
+#endif
+
+static_assert(isUserspace32bit() || isUserspace64bit(), "must be either 32 or 64 bit");
+
 // Figure out the bitness of the kernel.
-static inline __unused bool isKernel64Bit() {
+static inline bool isKernel64Bit() {
     // a 64-bit userspace requires a 64-bit kernel
     if (isUserspace64bit()) return true;
 
@@ -100,5 +114,37 @@
     return cache;
 }
 
+static inline __unused bool isKernel32Bit() {
+    return !isKernel64Bit();
+}
+
+static __unused constexpr bool isArm() {
+#if defined(__arm__) || defined(__aarch64__)
+    return true;
+#else
+    return false;
+#endif
+}
+
+static __unused constexpr bool isX86() {
+#if defined(__i386__) || defined(__x86_64__)
+    return true;
+#else
+    return false;
+#endif
+}
+
+static __unused constexpr bool isRiscV() {
+#if defined(__riscv)
+    static_assert(isUserspace64bit(), "riscv must be 64 bit");
+    return true;
+#else
+    return false;
+#endif
+}
+
+static_assert(isArm() || isX86() || isRiscV(), "Unknown architecture");
+
+
 }  // namespace bpf
 }  // namespace android