From 8c547152aa28f6976f2fff730acc52b6be067d78 Mon Sep 17 00:00:00 2001
From: Tapas Pradhan <tpradhan@codeaurora.org>
Date: Thu, 24 Jul 2014 19:07:23 +0530
Subject: Dalvik :Increase the upper limit check for DexOpt Deps table

Increasing upper limit check for the Deps table as additonal
jars added causes the dalvik to crash while performing dexopt
on cached jar files. This is needed for passing cts test case
which is part of libcore.java.util.jar.DalvikExecTest class

Change-Id: I13e7f4b0a5f9fe11fceb447ae3f64e8dc4ccf164
CR:697166
---
 vm/analysis/DexPrepare.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/analysis/DexPrepare.cpp b/vm/analysis/DexPrepare.cpp
index 753b6fee0..0130389f5 100644
--- a/vm/analysis/DexPrepare.cpp
+++ b/vm/analysis/DexPrepare.cpp
@@ -1153,7 +1153,7 @@ static const u1* getSignature(const ClassPathEntry* cpe)
  * If this changes, update DEX_OPT_MAGIC_VERS.
  */
 static const size_t kMinDepSize = 4 * 4;
-static const size_t kMaxDepSize = 4 * 4 + 3200;     // sanity check
+static const size_t kMaxDepSize = 4 * 4 + 3344;     // sanity check
 
 /*
  * Read the "opt" header, verify it, then read the dependencies section
-- 
cgit v1.2.3


From b076fcf9afc59e8f307eb38915161dc47c1b9e91 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Mon, 1 Sep 2014 22:21:52 -0700
Subject: Revert "Revert "dalvik: add placeholder for future changes""

This reverts commit cd2251b84a8c15d970267b77e8116ee0b26289e0.

Change-Id: I399e390fbd1e42b935f1e4ac9d905a9d1e635e96
---
 vm/compiler/Frontend.cpp                  | 8 ++++++++
 vm/compiler/codegen/arm/CodegenDriver.cpp | 3 ++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/vm/compiler/Frontend.cpp b/vm/compiler/Frontend.cpp
index 65ef1ebd9..3cebe8238 100644
--- a/vm/compiler/Frontend.cpp
+++ b/vm/compiler/Frontend.cpp
@@ -1484,6 +1484,11 @@ static bool exhaustTrace(CompilationUnit *cUnit, BasicBlock *curBlock)
     return true;
 }
 
+/* placeholder of future passes */
+__attribute__((weak)) void dvmExtraPass(CompilationUnit *cUnit)
+{
+}
+
 /* Compile a loop */
 static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset,
                         JitTraceDescription *desc, int numMaxInsts,
@@ -1574,12 +1579,15 @@ static bool compileLoop(CompilationUnit *cUnit, unsigned int startOffset,
 
     dvmCompilerLoopOpt(cUnit);
 
+
     /*
      * Change the backward branch to the backward chaining cell after dataflow
      * analsys/optimizations are done.
      */
     dvmCompilerInsertBackwardChaining(cUnit);
 
+    dvmExtraPass(cUnit);
+
 #if defined(ARCH_IA32)
     /* Convert MIR to LIR, etc. */
     dvmCompilerMIR2LIR(cUnit, info);
diff --git a/vm/compiler/codegen/arm/CodegenDriver.cpp b/vm/compiler/codegen/arm/CodegenDriver.cpp
index 93ea6133a..fde74efbb 100644
--- a/vm/compiler/codegen/arm/CodegenDriver.cpp
+++ b/vm/compiler/codegen/arm/CodegenDriver.cpp
@@ -4417,7 +4417,8 @@ void dvmCompilerMIR2LIR(CompilationUnit *cUnit)
              * Append the label pseudo LIR first. Chaining cells will be handled
              * separately afterwards.
              */
-            dvmCompilerAppendLIR(cUnit, (LIR *) &labelList[i]);
+            if(bb->blockType != kDalvikByteCode || !bb->hidden)
+                dvmCompilerAppendLIR(cUnit, (LIR *) &labelList[i]);
         }
 
         if (bb->blockType == kEntryBlock) {
-- 
cgit v1.2.3


From 3aba1fe46a39b86b439d9f491149cde5e07b9e81 Mon Sep 17 00:00:00 2001
From: Steve Kondik <shade@chemlab.org>
Date: Sun, 14 Sep 2014 19:22:34 -0700
Subject: dalvik: Rename perf flag

Change-Id: I5aab012bbe9e461d24011bca3b3c0fa17b22be5f
---
 vm/Dvm.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vm/Dvm.mk b/vm/Dvm.mk
index 7c99255bc..e779d2560 100644
--- a/vm/Dvm.mk
+++ b/vm/Dvm.mk
@@ -264,7 +264,7 @@ ifeq ($(dvm_arch),arm)
 		compiler/template/out/CompilerTemplateAsm-$(dvm_arch_variant).S
   endif
   ifeq ($(call is-vendor-board-platform,QCOM),true)
-    ifeq ($(WITH_QC_PERF),true)
+    ifeq ($(TARGET_HAVE_QC_PERF),true)
       LOCAL_WHOLE_STATIC_LIBRARIES += libqc-dalvik
       LOCAL_SHARED_LIBRARIES += libqc-opt
       LOCAL_CFLAGS += -DWITH_QC_PERF
-- 
cgit v1.2.3