commit 0ece7b950dc5821e79c930acf31fb7e73c570849
author Elliott Hughes <enh@google.com> Fri Mar 09 18:14:40 2012 -0800
committer Elliott Hughes <enh@google.com> Sat Mar 10 09:51:21 2012 -0800
tree ce4006468c5ea8b068055b5f770b058477e35a25
parent e663a5b5b218deae32de739d89f888ceeeba65df

Remove an unnecessary "art" prefix on functions in the art namespace.

Change-Id: I160bc78ef9000364f657a9972dd8c648ca2f53aa

src/runtime_support.cc

diff --git a/src/runtime_support.cc b/src/runtime_support.cc
index 5670779..8dc518e 100644
--- a/src/runtime_support.cc
+++ b/src/runtime_support.cc
@@ -141,7 +141,7 @@
   FinishCalleeSaveFrameSetup(thread, sp, Runtime::kSaveAll);
   // Remove extra entry pushed onto second stack during method tracing
   if (Runtime::Current()->IsMethodTracingActive()) {
-    artTraceMethodUnwindFromCode(thread);
+    TraceMethodUnwindFromCode(thread);
   }
   thread->SetStackEndForStackOverflow();  // Allow space on the stack for constructor to execute
   thread->ThrowNewExceptionF("Ljava/lang/StackOverflowError;",
@@ -1208,7 +1208,7 @@
   return lr;
 }
 
-uint32_t artTraceMethodUnwindFromCode(Thread* self) {
+uint32_t TraceMethodUnwindFromCode(Thread* self) {
   Trace* tracer = Runtime::Current()->GetTracer();
   TraceStackFrame trace_frame = self->PopTraceStackFrame();
   Method* method = trace_frame.method_;
@@ -1219,7 +1219,7 @@
   return lr;
 }
 
-int artCmplFloat(float a, float b) {
+int CmplFloat(float a, float b) {
   if (a == b) {
     return 0;
   } else if (a < b) {
@@ -1230,7 +1230,7 @@
   return -1;
 }
 
-int artCmpgFloat(float a, float b) {
+int CmpgFloat(float a, float b) {
   if (a == b) {
     return 0;
   } else if (a < b) {
@@ -1241,7 +1241,7 @@
   return 1;
 }
 
-int artCmpgDouble(double a, double b) {
+int CmpgDouble(double a, double b) {
   if (a == b) {
     return 0;
   } else if (a < b) {
@@ -1252,7 +1252,7 @@
   return 1;
 }
 
-int artCmplDouble(double a, double b) {
+int CmplDouble(double a, double b) {
   if (a == b) {
     return 0;
   } else if (a < b) {

src/runtime_support.h

diff --git a/src/runtime_support.h b/src/runtime_support.h
index 271cc83..c74b9c5 100644
--- a/src/runtime_support.h
+++ b/src/runtime_support.h
@@ -42,11 +42,11 @@
 uint32_t IsAssignableFromCode(const Class* klass, const Class* ref_class);
 void ObjectInitFromCode(Object* o);
 extern void LockObjectFromCode(Thread* thread, Object* obj);
-uint32_t artTraceMethodUnwindFromCode(Thread* self);
-extern int artCmpgDouble(double a, double b);
-extern int artCmplDouble(double a, double b);
-extern int artCmpgFloat(float a, float b);
-extern int artCmplFloat(float a, float b);
+uint32_t TraceMethodUnwindFromCode(Thread* self);
+extern int CmpgDouble(double a, double b);
+extern int CmplDouble(double a, double b);
+extern int CmpgFloat(float a, float b);
+extern int CmplFloat(float a, float b);
 extern int64_t D2L(double d);
 extern int64_t F2L(float f);
 

src/thread.cc

diff --git a/src/thread.cc b/src/thread.cc
index ac0922d..8470b8d 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -93,10 +93,10 @@
   pDdiv = __divdf3;
   pDmul = muldf3;
   pFmod = fmod;
-  pCmpgFloat = artCmpgFloat;
-  pCmplFloat = artCmplFloat;
-  pCmpgDouble = artCmpgDouble;
-  pCmplDouble = artCmplDouble;
+  pCmpgFloat = CmpgFloat;
+  pCmplFloat = CmplFloat;
+  pCmpgDouble = CmpgDouble;
+  pCmplDouble = CmplDouble;
 #endif
 #if defined(__arm__)
   pShlLong = art_shl_long;
@@ -1458,7 +1458,7 @@
 #if defined(__arm__)
           uintptr_t trace_exit = reinterpret_cast<uintptr_t>(art_trace_exit_from_code);
           if (ManglePc(trace_exit) == pc) {
-            pc = ManglePc(artTraceMethodUnwindFromCode(Thread::Current()));
+            pc = ManglePc(TraceMethodUnwindFromCode(Thread::Current()));
           }
 #else
           UNIMPLEMENTED(WARNING);