NCF: Move Sp methods to closer to its definition

Author: kateinoigakukun

Sources/WasmKit/Execution/Execution.swift

@@ -107,6 +107,41 @@ typealias Sp = UnsafeMutablePointer<StackSlot>
 ///         "is compiled" check on the next execution.
 typealias Pc = UnsafeMutablePointer<CodeSlot>
 
+extension Sp {
+    subscript<R: FixedWidthInteger>(_ index: R) -> UntypedValue {
+        get {
+            return UntypedValue(storage: self[Int(index)])
+        }
+        nonmutating set {
+            return self[Int(index)] = newValue.storage
+        }
+    }
+    private func read<T: FixedWidthInteger, R: FixedWidthInteger>(_ index: R) -> T {
+        return self.advanced(by: Int(index)).withMemoryRebound(to: T.self, capacity: 1) {
+            $0.pointee
+        }
+    }
+    private func write<R: FixedWidthInteger>(_ index: R, _ value: UntypedValue) {
+        self[Int(index)] = value
+    }
+    subscript<R: FixedWidthInteger>(i32 index: R) -> UInt32 {
+        get { return read(index) }
+        nonmutating set { write(index, .i32(newValue)) }
+    }
+    subscript<R: FixedWidthInteger>(i64 index: R) -> UInt64 {
+        get { return read(index) }
+        nonmutating set { write(index, .i64(newValue)) }
+    }
+    subscript<R: FixedWidthInteger>(f32 index: R) -> Float32 {
+        get { return Float32(bitPattern: read(index)) }
+        nonmutating set { write(index, .f32(newValue)) }
+    }
+    subscript<R: FixedWidthInteger>(f64 index: R) -> Float64 {
+        get { return Float64(bitPattern: read(index)) }
+        nonmutating set { write(index, .f64(newValue)) }
+    }
+}
+
 extension Pc {
     /// Reads a value from the current program counter and advances the pointer.
     mutating func read<T>(_: T.Type = T.self) -> T {
@@ -393,38 +428,3 @@ extension Execution {
         }
     }
 }
-
-extension Sp {
-    subscript<R: FixedWidthInteger>(_ index: R) -> UntypedValue {
-        get {
-            return UntypedValue(storage: self[Int(index)])
-        }
-        nonmutating set {
-            return self[Int(index)] = newValue.storage
-        }
-    }
-    private func read<T: FixedWidthInteger, R: FixedWidthInteger>(_ index: R) -> T {
-        return self.advanced(by: Int(index)).withMemoryRebound(to: T.self, capacity: 1) {
-            $0.pointee
-        }
-    }
-    private func write<R: FixedWidthInteger>(_ index: R, _ value: UntypedValue) {
-        self[Int(index)] = value
-    }
-    subscript<R: FixedWidthInteger>(i32 index: R) -> UInt32 {
-        get { return read(index) }
-        nonmutating set { write(index, .i32(newValue)) }
-    }
-    subscript<R: FixedWidthInteger>(i64 index: R) -> UInt64 {
-        get { return read(index) }
-        nonmutating set { write(index, .i64(newValue)) }
-    }
-    subscript<R: FixedWidthInteger>(f32 index: R) -> Float32 {
-        get { return Float32(bitPattern: read(index)) }
-        nonmutating set { write(index, .f32(newValue)) }
-    }
-    subscript<R: FixedWidthInteger>(f64 index: R) -> Float64 {
-        get { return Float64(bitPattern: read(index)) }
-        nonmutating set { write(index, .f64(newValue)) }
-    }
-}