recursion_sentry: Cleanup

lhmouse · Mar 13, 2024 · dbcf7a0 · dbcf7a0
1 parent 71cef1d
commit dbcf7a0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 13 deletions.
diff --git a/asteria/recursion_sentry.cpp b/asteria/recursion_sentry.cpp
@@ -8,11 +8,11 @@ namespace asteria {
 
 void
 Recursion_Sentry::
-do_throw_stack_overflow(ptrdiff_t usage) const
+do_throw_stack_overflow(ptrdiff_t usage, int limit) const
   {
      ::rocket::sprintf_and_throw<::std::invalid_argument>(
-           "asteria::Recursion_Sentry: stack overflow averted (`%td` > `%ld`)",
-           ::std::abs(usage), 1L << stack_mask_bits);
+           "do_throw_stack_overflow: stack overflow averted (`%td` > `%d`)",
+           usage, limit);
   }
 
 }  // namespace asteria
diff --git a/asteria/recursion_sentry.hpp b/asteria/recursion_sentry.hpp
@@ -9,12 +9,6 @@ namespace asteria {
 
 class Recursion_Sentry
   {
-  public:
-    enum : uint32_t
-      {
-        stack_mask_bits = 20,  // 1 MiB
-      };
-
   private:
     const void* m_base;
 
@@ -45,21 +39,24 @@ class Recursion_Sentry
   private:
     [[noreturn]]
     void
-    do_throw_stack_overflow(ptrdiff_t usage) const;
+    do_throw_stack_overflow(ptrdiff_t usage, int limit) const;
 
     void
     do_validate_stack_usage() const
       {
         ptrdiff_t usage = (char*) this->m_base - (char*) this;
-        if(ROCKET_UNEXPECT(((usage >> stack_mask_bits) + 1) >> 1 != 0))
-          this->do_throw_stack_overflow(usage);
+        constexpr int mask_bits = 20;  // 1 MiB
+        constexpr int ptr_bits = ::std::numeric_limits<ptrdiff_t>::digits;
+
+        if(ROCKET_UNEXPECT(usage >> mask_bits != usage >> ptr_bits))
+          this->do_throw_stack_overflow(usage, 1 << mask_bits);
       }
 
   public:
     // Make this class non-trivial.
     ~Recursion_Sentry()
       {
-        __asm__ volatile ("" :);
+        __asm__ ("");
       }
 
     const void*