Staticify.

Mark some functions "static".

Change-Id: Ia80bccab1f72690729e43f99783d34fe366108b2

diff --git a/vm/AllocTracker.c b/vm/AllocTracker.c
index 168713c..d371fd1 100644 (file)
--- a/vm/AllocTracker.c
+++ b/vm/AllocTracker.c
@@ -461,7 +461,7 @@ static size_t computeStringTableSize(PointerSet* strings)
  *
  * Returns the string's length, in characters.
  */
-int convertUtf8ToUtf16BEUA(u1* utf16Str, const char* utf8Str)
+static int convertUtf8ToUtf16BEUA(u1* utf16Str, const char* utf8Str)
 {
     u1* origUtf16Str = utf16Str;
 

diff --git a/vm/Sync.c b/vm/Sync.c
index b771b1c..50a7a5e 100644 (file)
--- a/vm/Sync.c
+++ b/vm/Sync.c
@@ -660,7 +660,7 @@ static void waitSetRemove(Monitor *mon, Thread *thread)
 /*
  * Converts the given relative waiting time into an absolute time.
  */
-void absoluteTime(s8 msec, s4 nsec, struct timespec *ts)
+static void absoluteTime(s8 msec, s4 nsec, struct timespec *ts)
 {
     s8 endSec;
 

diff --git a/vm/compiler/Compiler.c b/vm/compiler/Compiler.c
index 8c26989..1ac6e97 100644 (file)
--- a/vm/compiler/Compiler.c
+++ b/vm/compiler/Compiler.c
@@ -327,7 +327,7 @@ void dvmCompilerPerformSafePointChecks(void)
     dvmCompilerPatchInlineCache();
 }
 
-bool compilerThreadStartup(void)
+static bool compilerThreadStartup(void)
 {
     JitEntry *pJitTable = NULL;
     unsigned char *pJitProfTable = NULL;

diff --git a/vm/compiler/Frontend.c b/vm/compiler/Frontend.c
index 525ec72..7f02ea1 100644 (file)
--- a/vm/compiler/Frontend.c
+++ b/vm/compiler/Frontend.c
@@ -377,7 +377,7 @@ CompilerMethodStats *dvmCompilerAnalyzeMethodBody(const Method *method,
  * Crawl the stack of the thread that requesed compilation to see if any of the
  * ancestors are on the blacklist.
  */
-bool filterMethodByCallGraph(Thread *thread, const char *curMethodName)
+static bool filterMethodByCallGraph(Thread *thread, const char *curMethodName)
 {
     /* Crawl the Dalvik stack frames and compare the method name*/
     StackSaveArea *ssaPtr = ((StackSaveArea *) thread->curFrame) - 1;

diff --git a/vm/compiler/Ralloc.c b/vm/compiler/Ralloc.c
index f227527..744bc32 100644 (file)
--- a/vm/compiler/Ralloc.c
+++ b/vm/compiler/Ralloc.c
@@ -25,7 +25,7 @@ typedef struct LiveRange {
     int last;
 } LiveRange;
 
-int computeLiveRange(LiveRange *list, BasicBlock *bb, int seqNum)
+static int computeLiveRange(LiveRange *list, BasicBlock *bb, int seqNum)
 {
     MIR *mir;
     int i;

diff --git a/vm/compiler/codegen/arm/CodegenCommon.c b/vm/compiler/codegen/arm/CodegenCommon.c
index d8854ba..ee5d9f5 100644 (file)
--- a/vm/compiler/codegen/arm/CodegenCommon.c
+++ b/vm/compiler/codegen/arm/CodegenCommon.c
@@ -361,7 +361,7 @@ static void genBarrier(CompilationUnit *cUnit)
 }
 
 /* Create the PC reconstruction slot if not already done */
-extern ArmLIR *genCheckCommon(CompilationUnit *cUnit, int dOffset,
+static ArmLIR *genCheckCommon(CompilationUnit *cUnit, int dOffset,
                               ArmLIR *branch,
                               ArmLIR *pcrLabel)
 {

diff --git a/vm/compiler/codegen/arm/RallocUtil.c b/vm/compiler/codegen/arm/RallocUtil.c
index e917995..ff5d16b 100644 (file)
--- a/vm/compiler/codegen/arm/RallocUtil.c
+++ b/vm/compiler/codegen/arm/RallocUtil.c
@@ -710,7 +710,7 @@ extern void dvmCompilerMarkInUse(CompilationUnit *cUnit, int reg)
           info->inUse = true;
 }
 
-void copyRegInfo(CompilationUnit *cUnit, int newReg, int oldReg)
+static void copyRegInfo(CompilationUnit *cUnit, int newReg, int oldReg)
 {
     RegisterInfo *newInfo = getRegInfo(cUnit, newReg);
     RegisterInfo *oldInfo = getRegInfo(cUnit, oldReg);

diff --git a/vm/interp/Jit.c b/vm/interp/Jit.c
index fda9f18..19f2cf6 100644 (file)
--- a/vm/interp/Jit.c
+++ b/vm/interp/Jit.c
@@ -517,7 +517,7 @@ void dvmJitStats()
 }
 
 
-void setTraceConstruction(JitEntry *slot, bool value)
+static void setTraceConstruction(JitEntry *slot, bool value)
 {
 
     JitEntryInfoUnion oldValue;
@@ -530,7 +530,7 @@ void setTraceConstruction(JitEntry *slot, bool value)
             &slot->u.infoWord) != 0);
 }
 
-void resetTracehead(InterpState* interpState, JitEntry *slot)
+static void resetTracehead(InterpState* interpState, JitEntry *slot)
 {
     slot->codeAddress = dvmCompilerGetInterpretTemplate();
     setTraceConstruction(slot, false);