From c1786640496b4cf7a94a87497b5947f37407a2c2 Mon Sep 17 00:00:00 2001
From: "deanm@chromium.org"
 <deanm@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 12 Sep 2008 11:00:36 +0000
Subject: [PATCH] Fix some arm related flags with the new flag system.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@298 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 src/simulator-arm.cc              | 6 +++---
 test/cctest/test-assembler-arm.cc | 9 +--------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/src/simulator-arm.cc b/src/simulator-arm.cc
index 4d8bcdc403..d76957fe28 100644
--- a/src/simulator-arm.cc
+++ b/src/simulator-arm.cc
@@ -1339,7 +1339,7 @@ void Simulator::InstructionDecode(Instr* instr) {
     dbg.Stop(instr);
     return;
   }
-  if (FLAG_trace_sim) {
+  if (::v8::internal::FLAG_trace_sim) {
     disasm::Disassembler dasm;
     // use a reasonably large buffer
     v8::internal::EmbeddedVector<char, 256> buffer;
@@ -1396,7 +1396,7 @@ void Simulator::execute() {
   // raw PC value and not the one used as input to arithmetic instructions.
   int program_counter = get_pc();
 
-  if (FLAG_stop_sim_at == 0) {
+  if (::v8::internal::FLAG_stop_sim_at == 0) {
     // Fast version of the dispatch loop without checking whether the simulator
     // should be stopping at a particular executed instruction.
     while (program_counter != end_sim_pc) {
@@ -1411,7 +1411,7 @@ void Simulator::execute() {
     while (program_counter != end_sim_pc) {
       Instr* instr = reinterpret_cast<Instr*>(program_counter);
       icount_++;
-      if (icount_ == FLAG_stop_sim_at) {
+      if (icount_ == ::v8::internal::FLAG_stop_sim_at) {
         Debugger dbg(this);
         dbg.Debug();
       } else {
diff --git a/test/cctest/test-assembler-arm.cc b/test/cctest/test-assembler-arm.cc
index a02441de7d..7903fabb84 100644
--- a/test/cctest/test-assembler-arm.cc
+++ b/test/cctest/test-assembler-arm.cc
@@ -33,14 +33,6 @@
 #include "assembler-arm-inl.h"
 #include "cctest.h"
 
-// The test framework does not accept flags on the command line, so we set them
-namespace v8 { namespace internal {
-  DECLARE_string(natives_file);
-  DECLARE_bool(debug_code);
-  DECLARE_bool(eliminate_jumps);
-  DECLARE_bool(print_jump_elimination);
-} }  // namespace v8::internal
-
 using namespace v8::internal;
 
 
@@ -53,6 +45,7 @@ typedef int (*F3)(void* p, int p1, int p2, int p3, int p4);
 static v8::Persistent<v8::Context> env;
 
 
+// The test framework does not accept flags on the command line, so we set them
 static void InitializeVM() {
   // disable compilation of natives by specifying an empty natives file
   FLAG_natives_file = "";