rename java.misc.Memory to jvm.internal.Memory

c/classpath.h

@@ -16,7 +16,6 @@
 #include "classes/java/lang/Exception.class.h"
 #include "classes/java/lang/Throwable.class.h"
 #include "classes/java/lang/Backtrace.class.h"
-#include "classes/java/misc/Memory.class.h"
 #include "classes/sega/dreamcast/gdrom/G1IF.class.h"
 #include "classes/sega/dreamcast/gdrom/GdromIF.class.h"
 #include "classes/sega/dreamcast/gdrom/GdromBits.class.h"
@@ -28,3 +27,4 @@
 #include "classes/sega/dreamcast/gdrom/GdromCommandPacketInterface.class.h"
 #include "classes/sega/dreamcast/gdrom/GdromProtocol.class.h"
 #include "classes/jvm/internal/Loader.class.h"
+#include "classes/jvm/internal/Memory.class.h"

c/classpath.inc.c

@@ -16,7 +16,6 @@
 (const uint8_t *)&_binary_classes_java_lang_Exception_class_start,
 (const uint8_t *)&_binary_classes_java_lang_Throwable_class_start,
 (const uint8_t *)&_binary_classes_java_lang_Backtrace_class_start,
-(const uint8_t *)&_binary_classes_java_misc_Memory_class_start,
 (const uint8_t *)&_binary_classes_sega_dreamcast_gdrom_G1IF_class_start,
 (const uint8_t *)&_binary_classes_sega_dreamcast_gdrom_GdromIF_class_start,
 (const uint8_t *)&_binary_classes_sega_dreamcast_gdrom_GdromBits_class_start,
@@ -28,3 +27,4 @@
 (const uint8_t *)&_binary_classes_sega_dreamcast_gdrom_GdromCommandPacketInterface_class_start,
 (const uint8_t *)&_binary_classes_sega_dreamcast_gdrom_GdromProtocol_class_start,
 (const uint8_t *)&_binary_classes_jvm_internal_Loader_class_start,
+(const uint8_t *)&_binary_classes_jvm_internal_Memory_class_start,

classes/example/DreamcastVideo.java

@@ -1,7 +1,7 @@
 package example;
 
 import sega.dreamcast.holly.Holly;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 class DreamcastVideo {
     public static void main() {

classes/example/GdromClassLoader.java

@@ -4,7 +4,7 @@ import sega.dreamcast.gdrom.GdromExtentReader;
 import sega.dreamcast.gdrom.GdromProtocol;
 import sega.dreamcast.gdrom.GdromIF;
 import sega.dreamcast.gdrom.G1IF;
-import java.misc.Memory;
+import jvm.internal.Memory;
 import filesystem.iso9660.VolumeParser;
 import filesystem.iso9660.DirectoryRecordHandler;
 import filesystem.iso9660.DirectoryRecord;

classes/example/JavaCube.java

@@ -20,7 +20,6 @@ import model.Vec3;
 import model.Vec2;
 import model.FacePTN;
 import model.ModelObject;
-import java.misc.Memory;
 import filesystem.iso9660.VolumeParser;
 import filesystem.iso9660.DirectoryRecordHandler;
 import filesystem.iso9660.DirectoryRecord;
@@ -29,7 +28,7 @@ import sega.dreamcast.gdrom.GdromProtocol;
 import sega.dreamcast.gdrom.GdromIF;
 import sega.dreamcast.gdrom.G1IF;
 import sega.dreamcast.gdrom.Gdrom;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 class JavaCubeDirectoryRecordHandler implements DirectoryRecordHandler {
     int[] texture_extents;

classes/java/misc/Resource.java

@@ -1,8 +0,0 @@
-package java.misc;
-
-public class Resource {
-    private Resource() {
-    }
-
-    public static native int[] getResource(String name);
-}

classes/java/nio/ByteOrder.java

@@ -1,6 +1,6 @@
 package java.nio;
 
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class ByteOrder {
     public static final ByteOrder BIG_ENDIAN = new ByteOrder();

classes/jvm/internal/Memory.java

@@ -1,4 +1,4 @@
-package java.misc;
+package jvm.internal;
 
 public class Memory {
     public static native void putU4(int address, int value);

classes/p/Native.java

@@ -1,6 +1,6 @@
 package p;
 
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 class Native {
     public static void main() {

classes/p/TestLoader.java

@@ -1,7 +1,7 @@
 package p;
 
 import jvm.internal.Loader;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 class TestLoader {
     static byte[][] buffers;

classes/p/TestResource.java

@@ -1,12 +0,0 @@
-package p;
-
-import java.misc.Resource;
-
-class TestResource {
-    public static void test() {
-        Resource.getResource("foo");
-    }
-    public static void main() {
-        test();
-    }
-}

classes/sega/dreamcast/gdrom/GdromIF.java

@@ -1,7 +1,7 @@
 package sega.dreamcast.gdrom;
 
 import sega.dreamcast.gdrom.G1IF;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class GdromIF {
     // transfer_length is in bytes

classes/sega/dreamcast/gdrom/GdromProtocol.java

@@ -1,6 +1,6 @@
 package sega.dreamcast.gdrom;
 
-import java.misc.Memory;
+import jvm.internal.Memory;
 import sega.dreamcast.gdrom.GdromCommandPacketFormat;
 
 public class GdromProtocol {

classes/sega/dreamcast/holly/Background.java

@@ -2,7 +2,7 @@ package sega.dreamcast.holly;
 
 import sega.dreamcast.MemoryMap;
 import sega.dreamcast.holly.ISPTSP;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class Background {
     private Background() {

classes/sega/dreamcast/holly/Core.java

@@ -2,7 +2,7 @@ package sega.dreamcast.holly;
 
 import sega.dreamcast.holly.Holly;
 import sega.dreamcast.holly.CoreBits;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class Core {
     private Core() {

classes/sega/dreamcast/holly/RegionArray.java

@@ -1,7 +1,7 @@
 package sega.dreamcast.holly;
 
 import sega.dreamcast.MemoryMap;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 // this is for a "type 2" region array.
 // region header type is specified in FPU_PARAM_CFG

classes/sega/dreamcast/holly/TAFIFOPolygonConverter.java

@@ -5,7 +5,7 @@ import sega.dreamcast.holly.CoreBits;
 import sega.dreamcast.holly.TABits;
 import sega.dreamcast.systembus.Systembus;
 import sega.dreamcast.systembus.SystembusBits;
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class TAFIFOPolygonConverter {
     private TAFIFOPolygonConverter() {

classes/sega/dreamcast/holly/VideoOutput.java

@@ -1,6 +1,6 @@
 package sega.dreamcast.holly;
 
-import java.misc.Memory;
+import jvm.internal.Memory;
 
 public class VideoOutput {
     public static void set_framebuffer_resolution(int x_size, int y_size)

classpath.mk

@@ -17,7 +17,6 @@ CLASS_PATH = \
 	classes/java/lang/Exception.class.o \
 	classes/java/lang/Throwable.class.o \
 	classes/java/lang/Backtrace.class.o \
-	classes/java/misc/Memory.class.o \
 	classes/sega/dreamcast/gdrom/G1IF.class.o \
 	classes/sega/dreamcast/gdrom/GdromIF.class.o \
 	classes/sega/dreamcast/gdrom/GdromBits.class.o \
@@ -28,4 +27,5 @@ CLASS_PATH = \
 	classes/sega/dreamcast/gdrom/GdromCommandPacketFormat_get_toc.class.o \
 	classes/sega/dreamcast/gdrom/GdromCommandPacketInterface.class.o \
 	classes/sega/dreamcast/gdrom/GdromProtocol.class.o \
-	classes/jvm/internal/Loader.class.o
+	classes/jvm/internal/Loader.class.o \
+	classes/jvm/internal/Memory.class.o

generate_classpath.sh

@@ -91,7 +91,6 @@ declare -a boot_classes=(
     java/lang/Exception.class
     java/lang/Throwable.class
     java/lang/Backtrace.class
-    java/misc/Memory.class
     sega/dreamcast/gdrom/G1IF.class
     sega/dreamcast/gdrom/GdromIF.class
     sega/dreamcast/gdrom/GdromBits.class
@@ -103,6 +102,7 @@ declare -a boot_classes=(
     sega/dreamcast/gdrom/GdromCommandPacketInterface.class
     sega/dreamcast/gdrom/GdromProtocol.class
     jvm/internal/Loader.class
+    jvm/internal/Memory.class
 )
 
 function boot_classes () {
@@ -152,7 +152,6 @@ declare -a application_classes=(
     sega/dreamcast/holly/TAVertexParameter_polygon_type_3.class
     sega/dreamcast/holly/TextureMemoryAllocation.class
     java/lang/Math.class
-    java/misc/Resource.class
 )
 
 function application_classes () {