README.md

@@ -8,13 +8,13 @@ through the global named `Java`.
 ### Dependencies
 
 - Android SDK Platform-Tools >= 27.0.1
-- Android NDK r15c
+- Android NDK r20
 
 With environment configured accordingly:
 
 ```sh
 $ export ANDROID_SDK_ROOT=~/Library/Android/Sdk
-$ export ANDROID_NDK_ROOT=/usr/local/opt/android-ndk-r15c
+$ export ANDROID_NDK_ROOT=/usr/local/opt/android-ndk-r20
 ```
 
 ### Configuration

index.js

@@ -1,12 +1,11 @@
-'use strict';
-
 const getApi = require('./lib/api');
 const {
   getAndroidVersion,
   withAllArtThreadsSuspended,
   withRunnableArtThread,
   makeArtClassVisitor,
-  makeArtClassLoaderVisitor
+  makeArtClassLoaderVisitor,
+  deoptimizeEverything
 } = require('./lib/android');
 const ClassFactory = require('./lib/class-factory');
 const Env = require('./lib/env');
@@ -231,18 +230,18 @@ function Runtime () {
     const loadedClassesOffset = 172;
     const hashEntrySize = 8;
     const ptrLoadedClassesHashtable = api.gDvm.add(loadedClassesOffset);
-    const hashTable = Memory.readPointer(ptrLoadedClassesHashtable);
-    const tableSize = Memory.readS32(hashTable);
+    const hashTable = ptrLoadedClassesHashtable.readPointer();
+    const tableSize = hashTable.readS32();
     const ptrpEntries = hashTable.add(12);
-    const pEntries = Memory.readPointer(ptrpEntries);
+    const pEntries = ptrpEntries.readPointer();
     const end = tableSize * hashEntrySize;
 
     for (let offset = 0; offset < end; offset += hashEntrySize) {
       const pEntryPtr = pEntries.add(offset);
-      const dataPtr = Memory.readPointer(pEntryPtr.add(4));
+      const dataPtr = pEntryPtr.add(4).readPointer();
       if (!(HASH_TOMBSTONE.equals(dataPtr) || dataPtr.isNull())) {
-        const descriptionPtr = Memory.readPointer(dataPtr.add(24));
-        const description = Memory.readCString(descriptionPtr);
+        const descriptionPtr = dataPtr.add(24).readPointer();
+        const description = descriptionPtr.readCString();
         callbacks.onMatch(description);
       }
     }
@@ -402,6 +401,13 @@ function Runtime () {
     return classFactory.registerClass(spec);
   };
 
+  Object.defineProperty(this, 'deoptimizeEverything', {
+    enumerable: true,
+    value: function () {
+      return deoptimizeEverything(vm, vm.getEnv());
+    }
+  });
+
   Object.defineProperty(this, 'vm', {
     enumerable: false,
     get: function () {
@@ -426,7 +432,7 @@ function Runtime () {
       const buffer = Memory.alloc(bufferSize);
       const size = readlink(pathname, buffer, ptr(bufferSize)).toInt32();
       if (size !== -1) {
-        const exe = Memory.readUtf8String(buffer, size);
+        const exe = buffer.readUtf8String(size);
         cachedIsAppProcess = [/^\/system\/bin\/app_process/.test(exe)];
       } else {
         cachedIsAppProcess = [true];