Move the definitions of data_register and address register into class…

… execution_context
vx68k · Dec 28, 2020 · 9ce1726 · 9ce1726
1 parent 713757f
commit 9ce1726
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 89 deletions.
diff --git a/libvm68k/bits/vm68k/execution_context.h b/libvm68k/bits/vm68k/execution_context.h
@@ -28,106 +28,107 @@
 
 namespace vm68k
 {
-    /**
-     * Data registers.
-     */
-    class _VM68K_PUBLIC data_register
-    {
-    private:
-        long_word::uint_type _value;
-
-    public:
-        data_register &operator =(const long_word value)
-        {
-            _value = value.to_uint();
-            return *this;
-        }
-
-        data_register &operator =(const word value)
-        {
-            auto unchanged = _value & 0xffff0000U;
-            _value = unchanged | value.to_uint();
-            return *this;
-        }
-
-        data_register &operator =(const byte value)
-        {
-            auto unchanged = _value & 0xffffff00U;
-            _value = unchanged | value.to_uint();
-            return *this;
-        }
-
-    public:
-        /**
-         * Converts the register value to a long word.
-         */
-        operator long_word() const noexcept
-        {
-            return long_word(_value);
-        }
-
-        /**
-         * Converts the register value to a word.
-         */
-        operator word() const noexcept
-        {
-            return word(_value);
-        }
-
-        /**
-         * Converts the register value to a byte.
-         */
-        operator byte() const noexcept
-        {
-            return byte(_value);
-        }
-    };
-
-    /**
-     * Address registers.
+    /*
+     * Execution contexts.
      */
-    class _VM68K_PUBLIC address_register
+    class _VM68K_PUBLIC execution_context
     {
-    private:
-        long_word::uint_type _value;
-
-    public:
-        address_register &operator =(const long_word value)
-        {
-            _value = value.to_int();
-            return *this;
-        }
-
-        address_register &operator =(const word value)
-        {
-            // Word assignments shall be sign-extended.
-            _value = value.to_int();
-            return *this;
-        }
-
     public:
         /**
-         * Converts the register value to a long word.
+         * Data registers.
          */
-        operator long_word() const noexcept
+        class data_register
         {
-            return long_word(_value);
-        }
+        private:
+            long_word::uint_type _value;
+
+        public:
+            data_register &operator =(const long_word value)
+            {
+                _value = value.to_uint();
+                return *this;
+            }
+
+            data_register &operator =(const word value)
+            {
+                auto unchanged = _value & 0xffff0000U;
+                _value = unchanged | value.to_uint();
+                return *this;
+            }
+
+            data_register &operator =(const byte value)
+            {
+                auto unchanged = _value & 0xffffff00U;
+                _value = unchanged | value.to_uint();
+                return *this;
+            }
+
+        public:
+            /**
+             * Converts the register value to a long word.
+             */
+            operator long_word() const noexcept
+            {
+                return long_word(_value);
+            }
+
+            /**
+             * Converts the register value to a word.
+             */
+            operator word() const noexcept
+            {
+                return word(_value);
+            }
+
+            /**
+             * Converts the register value to a byte.
+             */
+            operator byte() const noexcept
+            {
+                return byte(_value);
+            }
+        };
 
         /**
-         * Converts the register value to a word.
+         * Address registers.
          */
-        operator word() const noexcept
+        class address_register
         {
-            return word(_value);
-        }
-    };
+        private:
+            long_word::uint_type _value;
+
+        public:
+            address_register &operator =(const long_word value)
+            {
+                _value = value.to_int();
+                return *this;
+            }
+
+            address_register &operator =(const word value)
+            {
+                // Word assignments shall be sign-extended.
+                _value = value.to_int();
+                return *this;
+            }
+
+        public:
+            /**
+             * Converts the register value to a long word.
+             */
+            operator long_word() const noexcept
+            {
+                return long_word(_value);
+            }
+
+            /**
+             * Converts the register value to a word.
+             */
+            operator word() const noexcept
+            {
+                return word(_value);
+            }
+        };
 
-    /*
-     * Execution contexts.
-     */
-    class _VM68K_PUBLIC execution_context
-    {
     public:
         /**
          * Number of the data registers.

diff --git a/libvm68k/execution_context.cpp b/libvm68k/execution_context.cpp
@@ -30,6 +30,9 @@ using std::shared_ptr;
 using std::swap;
 using namespace vm68k;
 
+using data_register = execution_context::data_register;
+using address_register = execution_context::address_register;
+
 
 // Implementation of class execution_context.