Merge pull request ikvmnet#577 from ikvmnet/codedecoder

IKVM.ByteCode.Decoding.CodeDecoder
iterate-ch · Aug 19, 2024 · f380509 · f380509
2 parents 55e17a5 + f9de90a
commit f380509
Show file tree

Hide file tree

Showing 8 changed files with 795 additions and 337 deletions.
diff --git a/IKVM.deps.targets b/IKVM.deps.targets
@@ -1,7 +1,7 @@
 <Project>
 
     <ItemGroup>
-        <PackageReference Include="IKVM.ByteCode" Version="9.0.0" />
+        <PackageReference Include="IKVM.ByteCode" Version="9.1.0" />
     </ItemGroup>
 
     <Choose>

diff --git a/src/IKVM.Runtime/ClassFile.Method.Code.cs b/src/IKVM.Runtime/ClassFile.Method.Code.cs
diff --git a/src/IKVM.Runtime/ClassFile.Method.Instruction.cs b/src/IKVM.Runtime/ClassFile.Method.Instruction.cs
diff --git a/src/IKVM.Runtime/System/Index.cs b/src/IKVM.Runtime/System/Index.cs
@@ -2,7 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD2_1
+#if NETSTANDARD2_1 || NET
+using System.Runtime.CompilerServices;
+
 [assembly: TypeForwardedTo(typeof(System.Index))]
 #else
 using System.Runtime.CompilerServices;

diff --git a/src/IKVM.Runtime/System/Range.cs b/src/IKVM.Runtime/System/Range.cs
@@ -2,8 +2,10 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
-#if NETSTANDARD2_1
-[assembly: TypeForwardedTo(typeof(System.Range))]
+#if NETSTANDARD2_1 || NET
+using System.Runtime.CompilerServices;
+
+[assembly: TypeForwardedTo(typeof(global::System.Range))]
 #else
 using System.Runtime.CompilerServices;
 

diff --git a/src/IKVM.Runtime/System/Runtime/CompilerServices/RuntimeHelpers.cs b/src/IKVM.Runtime/System/Runtime/CompilerServices/RuntimeHelpers.cs
@@ -1,5 +0,0 @@
-#if NETFRAMEWORK
-
-
-
-#endif

diff --git a/src/IKVM.Util/IKVM.Util.csproj b/src/IKVM.Util/IKVM.Util.csproj
@@ -8,7 +8,7 @@
         <PackageReference Include="System.IO.Compression" Version="4.3.0" />
         <PackageReference Include="System.Memory" Version="4.5.5" />
         <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-        <PackageReference Include="IKVM.ByteCode" Version="9.0.0" />
+        <PackageReference Include="IKVM.ByteCode" Version="9.1.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/IKVM.Util/Jar/JarFileExtensions.cs b/src/IKVM.Util/Jar/JarFileExtensions.cs
@@ -45,7 +45,7 @@ static ModuleInfo GetModuleInfoFromClass(JarFile jar)
 
             using var s = e.Open();
             using var c = ClassFile.Read(s);
-            if ((c.AccessFlags & AccessFlag.ACC_MODULE) != 0)
+            if ((c.AccessFlags & AccessFlag.Module) != 0)
             {
                 var a = c.Attributes.FirstOrDefault(i => i.IsNotNil && i.Name.IsNotNil && c.Constants.Get(i.Name).Value == AttributeName.Module);
                 if (a.IsNotNil)