Another attempt.

copasi · Nov 18, 2024 · e9d6c81 · e9d6c81
1 parent 2a68867
commit e9d6c81
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/NativeJIT/inc/NativeJIT/CodeGen/Register.h b/src/NativeJIT/inc/NativeJIT/CodeGen/Register.h
@@ -34,9 +34,9 @@ namespace NativeJIT
     class RegisterBase
     {
     public:
-        static const unsigned c_maxSize = 8;
-        static const unsigned c_maxIntegerRegisterID = 16;
-        static const unsigned c_maxFloatRegisterID = 15;
+        static constexpr unsigned c_maxSize = 8;
+        static constexpr unsigned c_maxIntegerRegisterID = 16;
+        static constexpr unsigned c_maxFloatRegisterID = 15;
 
     protected:
         static const unsigned c_maxRegisterID = 16;

diff --git a/src/NativeJIT/inc/NativeJIT/ExpressionTreeDecls.h b/src/NativeJIT/inc/NativeJIT/ExpressionTreeDecls.h
@@ -315,14 +315,10 @@ namespace NativeJIT
         // the free list for a register and a C++ type respectively.
 
         template <bool ISFLOAT>
-        class FreeListForRegister
-        {
-            template <unsigned REGISTER_COUNT>
-            static auto Get(ExpressionTree& tree) -> FreeList<REGISTER_COUNT, ISFLOAT>;
-        };
+        class FreeListForRegister;
 
         template <typename T>
-        using FreeListForType = class ExpressionTree::FreeListForRegister<RegisterStorage<T>::c_isFloat>;
+        using FreeListForType = class ExpressionTree::FreeListForRegister<RegisterStorage<T>::XXXXXXXXX>;
 
         // The allocator and STL-compatible wrapper around it.
         Allocators::IAllocator& m_allocator;

diff --git a/src/NativeJIT/inc/NativeJIT/TypePredicates.h b/src/NativeJIT/inc/NativeJIT/TypePredicates.h
@@ -66,6 +66,7 @@ namespace NativeJIT
 
         static constexpr unsigned c_size = sizeof(UnderlyingType);
         static constexpr bool c_isFloat = std::is_floating_point<UnderlyingType>::value;
+        static constexpr bool XXXXXXXXX = std::is_floating_point<UnderlyingType>::value;
 
         typedef Register<c_size, c_isFloat> RegisterType;
     };