fix exit hook reg

Author: chancerly

jtik/src/main/cpp/dexter/instrumentation.cc

@@ -504,14 +504,13 @@ bool ExitHook::Apply(lir::CodeIr* code_ir) {
     }
 
     dex::u2 regIndexMethodId;
-    auto nonePareRegCount = regThisObjIndex;
-    bool isVRegEnough = nonePareRegCount - reg_count >= 2; //can use v1 and v2 to store jmethod id?
+    bool isVRegEnough = regThisObjIndex >= (reg + reg_count -1 ) + 3;
     if (isVRegEnough) {
       regIndexMethodId = reg+reg_count;
     } else {
       // try reuse param
       int paramBegin = std::max(regThisObjIndex  + (isStatic ? 0 : 1), int(reg + reg_count));
-      if (paramBegin > ir_method->code->registers-2) {// pram not enough,then scratch
+      if (paramBegin > (int)(ir_method->code->registers)-2) {// pram not enough,then scratch
         auto scratch = paramBegin + 1 - (ir_method->code->registers-1);
         slicer::AllocateScratchRegs alloc_regs(scratch, false);
         alloc_regs.Apply(code_ir);

jtik/src/main/cpp/jtik.cc

@@ -52,13 +52,13 @@ static bool SetDebuggableRelease(bool allowDebug) {
         SetJdwpAllowedFn(allowDebug);
     }
 
-    auto (*setJavaDebuggableFn)(void *, bool) = reinterpret_cast<void (*)(void *, bool)>(
-            ::dlsym(dlHandler.GetHandle(), "_ZN3art7Runtime17SetJavaDebuggableEb"));
-    CHECK_NULL_RETURN_BOOL(setJavaDebuggableFn,"setJavaDebuggableFn get fail");
-    void **runtimeInstance_ = static_cast<void **>(
-            ::dlsym(dlHandler.GetHandle(), "_ZN3art7Runtime9instance_E"));
-    CHECK_NULL_RETURN_BOOL(runtimeInstance_,"runtime instance get fail");
-    setJavaDebuggableFn(*runtimeInstance_, allowDebug);
+//    auto (*setJavaDebuggableFn)(void *, bool) = reinterpret_cast<void (*)(void *, bool)>(
+//            ::dlsym(dlHandler.GetHandle(), "_ZN3art7Runtime17SetJavaDebuggableEb"));
+//    CHECK_NULL_RETURN_BOOL(setJavaDebuggableFn,"setJavaDebuggableFn get fail");
+//    void **runtimeInstance_ = static_cast<void **>(
+//            ::dlsym(dlHandler.GetHandle(), "_ZN3art7Runtime9instance_E"));
+//    CHECK_NULL_RETURN_BOOL(runtimeInstance_,"runtime instance get fail");
+//    setJavaDebuggableFn(*runtimeInstance_, allowDebug);
     return true;
 }