DRAFT: Adoptopenjdk

CMakeLists.txt

@@ -77,8 +77,7 @@ endfunction(add_sanitizers)
 # Executables and libraries
 #
 
-# I'm not entirely sure how to use add_subdirectory(src) and we only have one executable anyway
-add_executable(SchokoVM
+set(COMMON_SOURCES
         src/main.cpp
         src/types.hpp
         src/classfile.hpp
@@ -92,13 +91,35 @@ add_executable(SchokoVM
         src/math.hpp
         src/classloading.cpp src/classloading.hpp
         )
+
+# I'm not entirely sure how to use add_subdirectory(src) and we only have one executable anyway
+add_executable(SchokoVM ${COMMON_SOURCES})
 add_sanitizers(SchokoVM)
 
+add_library(jvm SHARED
+        ${COMMON_SOURCES}
+        src/libjvm/cds.h
+        src/libjvm/jmm.h
+        src/libjvm/jvm.h
+        src/libjvm/jvm.cpp
+        src/libjvm/jvm_md.h
+        src/libjvm/jvm_constants.h
+        src/libjvm/jvm_io.h
+        src/libjvm/classfile_constants.h.template
+        src/libjvm/jni.h
+        src/libjvm/jni.cpp
+        src/libjvm/jni_md.h
+        src/libjvm/jvmticmlr.h
+        )
+target_compile_options(jvm PRIVATE -Wno-unused-parameter)
+
 if (libzip_FOUND)
     target_link_libraries(SchokoVM libzip::zip)
+    target_link_libraries(jvm libzip::zip)
 else ()
     # hope that it's on the standard search paths
     target_link_libraries(SchokoVM zip)
+    target_link_libraries(jvm zip)
 endif ()
 
 #

src/libjvm/cds.h

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_INCLUDE_CDS_H
+#define SHARE_INCLUDE_CDS_H
+
+// This file declares the CDS data structures that are used by the HotSpot Serviceability Agent
+// (see C sources inside src/jdk.hotspot.agent).
+//
+// We should use only standard C types. Do not use custom types such as bool, intx,
+// etc, to avoid introducing unnecessary dependencies to other HotSpot type declarations.
+//
+// Also, this is a C header file. Do not use C++ here.
+
+#define NUM_CDS_REGIONS 7 // this must be the same as MetaspaceShared::n_regions
+#define CDS_ARCHIVE_MAGIC 0xf00baba2
+#define CDS_DYNAMIC_ARCHIVE_MAGIC 0xf00baba8
+#define CURRENT_CDS_ARCHIVE_VERSION 11
+#define INVALID_CDS_ARCHIVE_VERSION -1
+
+struct CDSFileMapRegion {
+  int     _crc;               // CRC checksum of this region.
+  int     _read_only;         // read only region?
+  int     _allow_exec;        // executable code in this region?
+  int     _is_heap_region;    // Used by SA and debug build.
+  int     _is_bitmap_region;  // Relocation bitmap for RO/RW regions (used by SA and debug build).
+  int     _mapped_from_file;  // Is this region mapped from a file?
+                              // If false, this region was initialized using os::read().
+  size_t  _file_offset;       // Data for this region starts at this offset in the archive file.
+  size_t  _mapping_offset;    // This region should be mapped at this offset from the base address
+                              // - for non-heap regions, the base address is SharedBaseAddress
+                              // - for heap regions, the base address is the compressed oop encoding base
+  size_t  _used;              // Number of bytes actually used by this region (excluding padding bytes added
+                              // for alignment purposed.
+  size_t  _oopmap_offset;     // Bitmap for relocating embedded oops (offset from SharedBaseAddress).
+  size_t  _oopmap_size_in_bits;
+  char*   _mapped_base;       // Actually mapped address (NULL if this region is not mapped).
+};
+
+struct CDSFileMapHeaderBase {
+  unsigned int _magic;           // identify file type
+  int          _crc;             // header crc checksum
+  int          _version;         // must be CURRENT_CDS_ARCHIVE_VERSION
+  struct CDSFileMapRegion _space[NUM_CDS_REGIONS];
+};
+
+typedef struct CDSFileMapHeaderBase CDSFileMapHeaderBase;
+
+#endif // SHARE_INCLUDE_CDS_H