Quick Compiler: static, extern and inline cleanup
More declarations cleanup. Some dead code removal. No logic changes.
Change-Id: Ife3d0426082f4eeae7c0010ceb92d7dbdc823c71
diff --git a/src/compiler/codegen/ralloc_util.h b/src/compiler/codegen/ralloc_util.h
index 6947656..31fda52c 100644
--- a/src/compiler/codegen/ralloc_util.h
+++ b/src/compiler/codegen/ralloc_util.h
@@ -60,162 +60,153 @@
return mir->ssaRep->uses[num];
}
-extern RegLocation EvalLoc(CompilationUnit* cUnit, RegLocation loc,
+void ClobberSReg(CompilationUnit* cUnit, int sReg);
+RegLocation EvalLoc(CompilationUnit* cUnit, RegLocation loc,
int regClass, bool update);
/* Mark a temp register as dead. Does not affect allocation state. */
-extern void Clobber(CompilationUnit* cUnit, int reg);
-extern RegLocation UpdateLoc(CompilationUnit* cUnit, RegLocation loc);
+void Clobber(CompilationUnit* cUnit, int reg);
+RegLocation UpdateLoc(CompilationUnit* cUnit, RegLocation loc);
/* see comments for updateLoc */
-extern RegLocation UpdateLocWide(CompilationUnit* cUnit, RegLocation loc);
+RegLocation UpdateLocWide(CompilationUnit* cUnit, RegLocation loc);
-extern RegLocation UpdateRawLoc(CompilationUnit* cUnit, RegLocation loc);
+RegLocation UpdateRawLoc(CompilationUnit* cUnit, RegLocation loc);
-extern void MarkLive(CompilationUnit* cUnit, int reg, int sReg);
+void MarkLive(CompilationUnit* cUnit, int reg, int sReg);
-extern void MarkTemp(CompilationUnit* cUnit, int reg);
+void MarkTemp(CompilationUnit* cUnit, int reg);
-extern void UnmarkTemp(CompilationUnit* cUnit, int reg);
+void UnmarkTemp(CompilationUnit* cUnit, int reg);
-extern void MarkDirty(CompilationUnit* cUnit, RegLocation loc);
+void MarkDirty(CompilationUnit* cUnit, RegLocation loc);
-extern void MarkPair(CompilationUnit* cUnit, int lowReg, int highReg);
+void MarkPair(CompilationUnit* cUnit, int lowReg, int highReg);
-extern void MarkClean(CompilationUnit* cUnit, RegLocation loc);
+void MarkClean(CompilationUnit* cUnit, RegLocation loc);
-extern void ResetDef(CompilationUnit* cUnit, int reg);
+void ResetDef(CompilationUnit* cUnit, int reg);
-extern void ResetDefLoc(CompilationUnit* cUnit, RegLocation rl);
+void ResetDefLoc(CompilationUnit* cUnit, RegLocation rl);
/* Set up temp & preserved register pools specialized by target */
-extern void CompilerInitPool(RegisterInfo* regs, int* regNums, int num);
+void CompilerInitPool(RegisterInfo* regs, int* regNums, int num);
/*
* Mark the beginning and end LIR of a def sequence. Note that
* on entry start points to the LIR prior to the beginning of the
* sequence.
*/
-extern void MarkDef(CompilationUnit* cUnit, RegLocation rl, LIR* start,
+void MarkDef(CompilationUnit* cUnit, RegLocation rl, LIR* start,
LIR* finish);
/*
* Mark the beginning and end LIR of a def sequence. Note that
* on entry start points to the LIR prior to the beginning of the
* sequence.
*/
-extern void MarkDefWide(CompilationUnit* cUnit, RegLocation rl,
+void MarkDefWide(CompilationUnit* cUnit, RegLocation rl,
LIR* start, LIR* finish);
// Get the LocRecord associated with an SSA name use.
-extern RegLocation GetSrc(CompilationUnit* cUnit, MIR* mir, int num);
-extern RegLocation GetSrcWide(CompilationUnit* cUnit, MIR* mir, int low);
+RegLocation GetSrc(CompilationUnit* cUnit, MIR* mir, int num);
+RegLocation GetSrcWide(CompilationUnit* cUnit, MIR* mir, int low);
// Non-width checking version
-extern RegLocation GetRawSrc(CompilationUnit* cUnit, MIR* mir, int num);
+RegLocation GetRawSrc(CompilationUnit* cUnit, MIR* mir, int num);
// Get the LocRecord associated with an SSA name def.
-extern RegLocation GetDest(CompilationUnit* cUnit, MIR* mir);
-extern RegLocation GetDestWide(CompilationUnit* cUnit, MIR* mir);
+RegLocation GetDest(CompilationUnit* cUnit, MIR* mir);
+RegLocation GetDestWide(CompilationUnit* cUnit, MIR* mir);
// Non-width checking version
-extern RegLocation GetRawDest(CompilationUnit* cUnit, MIR* mir);
+RegLocation GetRawDest(CompilationUnit* cUnit, MIR* mir);
-extern RegLocation GetReturnWide(CompilationUnit* cUnit, bool isDouble);
+RegLocation GetReturnWide(CompilationUnit* cUnit, bool isDouble);
/* Clobber all regs that might be used by an external C call */
-extern void ClobberCalleeSave(CompilationUnit* cUnit);
+void ClobberCalleeSave(CompilationUnit* cUnit);
-extern RegisterInfo *IsTemp(CompilationUnit* cUnit, int reg);
+RegisterInfo *IsTemp(CompilationUnit* cUnit, int reg);
-extern RegisterInfo *IsPromoted(CompilationUnit* cUnit, int reg);
+RegisterInfo *IsPromoted(CompilationUnit* cUnit, int reg);
-extern bool IsDirty(CompilationUnit* cUnit, int reg);
+bool IsDirty(CompilationUnit* cUnit, int reg);
-extern void MarkInUse(CompilationUnit* cUnit, int reg);
+void MarkInUse(CompilationUnit* cUnit, int reg);
-extern int AllocTemp(CompilationUnit* cUnit);
+int AllocTemp(CompilationUnit* cUnit);
-extern int AllocTempFloat(CompilationUnit* cUnit);
+int AllocTempFloat(CompilationUnit* cUnit);
//REDO: too many assumptions.
-extern int AllocTempDouble(CompilationUnit* cUnit);
+int AllocTempDouble(CompilationUnit* cUnit);
-extern void FreeTemp(CompilationUnit* cUnit, int reg);
+void FreeTemp(CompilationUnit* cUnit, int reg);
-extern void ResetDefLocWide(CompilationUnit* cUnit, RegLocation rl);
+void ResetDefLocWide(CompilationUnit* cUnit, RegLocation rl);
-extern void ResetDefTracking(CompilationUnit* cUnit);
+void ResetDefTracking(CompilationUnit* cUnit);
-extern RegisterInfo *IsLive(CompilationUnit* cUnit, int reg);
+RegisterInfo *IsLive(CompilationUnit* cUnit, int reg);
/* To be used when explicitly managing register use */
-extern void LockCallTemps(CompilationUnit* cUnit);
+void LockCallTemps(CompilationUnit* cUnit);
-extern void FreeCallTemps(CompilationUnit* cUnit);
+void FreeCallTemps(CompilationUnit* cUnit);
-extern void FlushAllRegs(CompilationUnit* cUnit);
+void FlushAllRegs(CompilationUnit* cUnit);
-extern RegLocation GetReturnWideAlt(CompilationUnit* cUnit);
+RegLocation GetReturnWideAlt(CompilationUnit* cUnit);
-extern RegLocation GetReturn(CompilationUnit* cUnit, bool isFloat);
+RegLocation GetReturn(CompilationUnit* cUnit, bool isFloat);
-extern RegLocation GetReturnAlt(CompilationUnit* cUnit);
+RegLocation GetReturnAlt(CompilationUnit* cUnit);
/* Clobber any temp associated with an sReg. Could be in either class */
-extern void ClobberSReg(CompilationUnit* cUnit, int sReg);
/* Return a temp if one is available, -1 otherwise */
-extern int AllocFreeTemp(CompilationUnit* cUnit);
+int AllocFreeTemp(CompilationUnit* cUnit);
/* Attempt to allocate a callee-save register */
-extern int AllocPreservedCoreReg(CompilationUnit* cUnit, int sreg);
-extern int AllocPreservedFPReg(CompilationUnit* cUnit, int sReg,
- bool doubleStart);
-
/*
* Similar to AllocTemp(), but forces the allocation of a specific
* register. No check is made to see if the register was previously
* allocated. Use with caution.
*/
-extern void LockTemp(CompilationUnit* cUnit, int reg);
+void LockTemp(CompilationUnit* cUnit, int reg);
-extern RegLocation WideToNarrow(CompilationUnit* cUnit, RegLocation rl);
+RegLocation WideToNarrow(CompilationUnit* cUnit, RegLocation rl);
/*
* Free all allocated temps in the temp pools. Note that this does
* not affect the "liveness" of a temp register, which will stay
* live until it is either explicitly killed or reallocated.
*/
-extern void ResetRegPool(CompilationUnit* cUnit);
+void ResetRegPool(CompilationUnit* cUnit);
-extern void ClobberAllRegs(CompilationUnit* cUnit);
+void ClobberAllRegs(CompilationUnit* cUnit);
-extern void FlushRegWide(CompilationUnit* cUnit, int reg1, int reg2);
+void FlushRegWide(CompilationUnit* cUnit, int reg1, int reg2);
-extern void FlushReg(CompilationUnit* cUnit, int reg);
+void FlushReg(CompilationUnit* cUnit, int reg);
-extern void DoPromotion(CompilationUnit* cUnit);
-extern int VRegOffset(CompilationUnit* cUnit, int reg);
-extern int SRegOffset(CompilationUnit* cUnit, int reg);
-extern void CountRefs(CompilationUnit*, BasicBlock*, RefCounts*, RefCounts*);
-extern int SortCounts(const void *val1, const void *val2);
-extern void DumpCounts(const RefCounts* arr, int size, const char* msg);
-extern void RecordCorePromotion(CompilationUnit* cUnit, int reg, int sReg);
-extern void RecordFpPromotion(CompilationUnit* cUnit, int reg, int sReg);
+void DoPromotion(CompilationUnit* cUnit);
+int VRegOffset(CompilationUnit* cUnit, int reg);
+int SRegOffset(CompilationUnit* cUnit, int reg);
+void RecordCorePromotion(CompilationUnit* cUnit, int reg, int sReg);
+void RecordFpPromotion(CompilationUnit* cUnit, int reg, int sReg);
/* Architecture-dependent register allocation routines. */
-extern int AllocTypedTempPair(CompilationUnit* cUnit,
+int AllocTypedTempPair(CompilationUnit* cUnit,
bool fpHint, int regClass);
-extern int AllocTypedTemp(CompilationUnit* cUnit, bool fpHint, int regClass);
+int AllocTypedTemp(CompilationUnit* cUnit, bool fpHint, int regClass);
-extern void DumpCoreRegPool(CompilationUnit* cUint);
-extern void oatDumpFPRegPool(CompilationUnit* cUint);
-extern bool CheckCorePoolSanity(CompilationUnit* cUnit);
-extern RegisterInfo* GetRegInfo(CompilationUnit* cUnit, int reg);
-extern void NopLIR(LIR* lir);
-extern bool oatIsFPReg(int reg);
-extern uint32_t oatFPRegMask(void);
-extern void AdjustSpillMask(CompilationUnit* cUnit);
+void oatDumpFPRegPool(CompilationUnit* cUint);
+RegisterInfo* GetRegInfo(CompilationUnit* cUnit, int reg);
+void NopLIR(LIR* lir);
+bool oatIsFPReg(int reg);
+uint32_t oatFPRegMask(void);
+void AdjustSpillMask(CompilationUnit* cUnit);
void MarkPreservedSingle(CompilationUnit* cUnit, int vReg, int reg);
int ComputeFrameSize(CompilationUnit* cUnit);