From cf197fee81ac049ba0c94a471de747fff5255d3d Mon Sep 17 00:00:00 2001 From: bsimmers Date: Fri, 31 May 2013 14:15:00 -0700 Subject: [PATCH] Collapse runtime/vm/translator's contents into runtime/vm/jit Facebook: ~bsimmers/bin/move-vm-files.sh --- hphp/hhvm/process_init.cpp | 8 +++--- hphp/runtime/base/array/hphp_array_sort.cpp | 2 +- hphp/runtime/base/builtin_functions.cpp | 4 +-- hphp/runtime/base/execution_context.cpp | 4 +-- hphp/runtime/base/file/user_file.cpp | 2 +- hphp/runtime/base/hardware_counter.cpp | 2 +- hphp/runtime/base/intercept.cpp | 4 +-- hphp/runtime/base/program_functions.cpp | 2 +- .../base/server/admin_request_handler.cpp | 4 +-- hphp/runtime/base/stat_cache.cpp | 2 +- hphp/runtime/base/stats.cpp | 4 +-- hphp/runtime/base/string_data.cpp | 2 +- hphp/runtime/base/thread_info.cpp | 2 +- hphp/runtime/base/type_variant.cpp | 2 +- hphp/runtime/eval/debugger/break_point.cpp | 2 +- hphp/runtime/eval/debugger/debugger.cpp | 4 +-- hphp/runtime/eval/runtime/file_repository.cpp | 4 +-- hphp/runtime/ext/ext_array.cpp | 4 +-- hphp/runtime/ext/ext_class.cpp | 4 +-- hphp/runtime/ext/ext_closure.cpp | 2 +- hphp/runtime/ext/ext_collections.cpp | 2 +- hphp/runtime/ext/ext_continuation.cpp | 4 +-- hphp/runtime/ext/ext_curl.cpp | 2 +- hphp/runtime/ext/ext_debugger.cpp | 2 +- hphp/runtime/ext/ext_domdocument.cpp | 2 +- hphp/runtime/ext/ext_function.cpp | 4 +-- hphp/runtime/ext/ext_icu_ucnv.cpp | 2 +- hphp/runtime/ext/ext_misc.cpp | 4 +-- hphp/runtime/ext/ext_reflection.cpp | 2 +- hphp/runtime/ext/ext_xml.cpp | 4 +-- hphp/runtime/vm/bytecode.cpp | 6 ++--- hphp/runtime/vm/class.cpp | 4 +-- hphp/runtime/vm/debug/debug.cpp | 2 +- hphp/runtime/vm/debug/debug.h | 2 +- hphp/runtime/vm/debug/dwarf.cpp | 4 +-- hphp/runtime/vm/debug/dwarf.h | 2 +- hphp/runtime/vm/debug/elfwriter.cpp | 2 +- hphp/runtime/vm/debugger_hook.cpp | 2 +- hphp/runtime/vm/event_hook.cpp | 2 +- hphp/runtime/vm/event_hook.h | 2 +- hphp/runtime/vm/func.cpp | 4 +-- hphp/runtime/vm/funcdict.cpp | 4 +-- hphp/runtime/vm/instance.cpp | 2 +- hphp/runtime/vm/{translator => jit}/abi-x64.h | 2 +- .../vm/{translator => jit}/annotation.cpp | 6 ++--- .../vm/{translator => jit}/annotation.h | 2 +- .../vm/{translator => jit}/asm-x64-test.cpp | 0 .../vm/{translator => jit}/asm-x64-test.h | 0 .../vm/{translator/hopt => jit}/block.h | 6 ++--- .../runtime/vm/{translator/hopt => jit}/cfg.h | 4 +-- .../vm/{translator/hopt => jit}/check.cpp | 10 +++---- .../vm/{translator/hopt => jit}/check.h | 0 .../vm/{translator/hopt => jit}/codegen.cpp | 26 +++++++++---------- .../vm/{translator/hopt => jit}/codegen.h | 12 ++++----- .../vm/{translator => jit}/collector.cpp | 4 +-- .../runtime/vm/{translator/hopt => jit}/cse.h | 6 ++--- .../vm/{translator/hopt => jit}/dce.cpp | 12 ++++----- .../vm/{translator/hopt => jit}/edge.h | 0 .../vm/{translator/hopt => jit}/extradata.h | 2 +- hphp/runtime/vm/{translator => jit}/fixup.h | 4 +-- .../hopt => jit}/hhbctranslator.cpp | 10 +++---- .../{translator/hopt => jit}/hhbctranslator.h | 4 +-- hphp/runtime/vm/{translator => jit}/hooks.h | 0 .../vm/{translator => jit}/immstack.cpp | 2 +- .../runtime/vm/{translator => jit}/immstack.h | 0 .../vm/{translator/hopt => jit}/ir.cpp | 16 ++++++------ hphp/runtime/vm/{translator/hopt => jit}/ir.h | 12 ++++----- .../vm/{translator/hopt => jit}/irfactory.cpp | 4 +-- .../vm/{translator/hopt => jit}/irfactory.h | 4 +-- .../{translator/hopt => jit}/irinstruction.h | 6 ++--- .../{translator/hopt => jit}/irtranslator.cpp | 20 +++++++------- hphp/runtime/vm/{translator => jit}/jit.cfg | 0 .../vm/{translator/hopt => jit}/jumpopts.cpp | 6 ++--- .../vm/{translator/hopt => jit}/layout.cpp | 6 ++--- .../vm/{translator/hopt => jit}/layout.h | 4 +-- .../{translator/hopt => jit}/linearscan.cpp | 22 ++++++++-------- .../vm/{translator/hopt => jit}/linearscan.h | 6 ++--- .../vm/{translator => jit}/memcpy-x64.cpp | 0 .../vm/{translator/hopt => jit}/mutation.cpp | 4 +-- .../vm/{translator/hopt => jit}/mutation.h | 4 +-- .../{translator/hopt => jit}/nativecalls.cpp | 8 +++--- .../vm/{translator/hopt => jit}/nativecalls.h | 4 +-- .../vm/{translator/hopt => jit}/opt.cpp | 10 +++---- .../runtime/vm/{translator/hopt => jit}/opt.h | 0 .../vm/{translator => jit}/physreg.cpp | 2 +- hphp/runtime/vm/{translator => jit}/physreg.h | 0 .../hopt => jit}/predictionopts.cpp | 10 +++---- .../vm/{translator/hopt => jit}/print.cpp | 8 +++--- .../vm/{translator/hopt => jit}/print.h | 2 +- .../vm/{translator => jit}/runtime-type.cpp | 4 +-- .../vm/{translator => jit}/runtime-type.h | 0 .../{translator/hopt => jit}/simplifier.cpp | 4 +-- .../vm/{translator/hopt => jit}/simplifier.h | 4 +-- hphp/runtime/vm/{translator => jit}/srcdb.cpp | 4 +-- hphp/runtime/vm/{translator => jit}/srcdb.h | 2 +- .../vm/{translator/hopt => jit}/ssatmp.h | 2 +- .../{translator/hopt => jit}/state_vector.h | 2 +- .../vm/{translator => jit}/targetcache.cpp | 6 ++--- .../vm/{translator => jit}/targetcache.h | 4 +-- .../vm/{translator => jit}/test/fixup_map.cpp | 2 +- .../vm/{translator => jit}/test/main.cpp | 0 .../test/tread_hash_map.cpp | 0 .../vm/{translator/hopt => jit}/test/type.cpp | 2 +- .../{translator/hopt => jit}/test/vector.cpp | 2 +- .../vm/{translator/hopt => jit}/trace.h | 4 +-- .../{translator/hopt => jit}/tracebuilder.cpp | 6 ++--- .../{translator/hopt => jit}/tracebuilder.h | 10 +++---- .../vm/{translator => jit}/trans-data.h | 2 +- .../translator-asm-helpers.S | 0 .../{translator => jit}/translator-inline.h | 2 +- .../translator-runtime.cpp | 2 +- .../{translator => jit}/translator-runtime.h | 4 +-- .../translator-x64-helpers.cpp | 6 ++--- .../translator-x64-internal.h | 2 +- .../vm/{translator => jit}/translator-x64.cpp | 18 ++++++------- .../vm/{translator => jit}/translator-x64.h | 8 +++--- .../vm/{translator => jit}/translator.cpp | 12 ++++----- .../vm/{translator => jit}/translator.h | 10 +++---- .../vm/{translator/hopt => jit}/type.cpp | 8 +++--- .../vm/{translator/hopt => jit}/type.h | 2 +- hphp/runtime/vm/{translator => jit}/types.h | 0 .../vm/{translator => jit}/unwind-x64.cpp | 10 +++---- .../vm/{translator => jit}/unwind-x64.h | 6 ++--- .../hopt => jit}/vectortranslator-internal.h | 2 +- .../hopt => jit}/vectortranslator.cpp | 10 +++---- .../vm/{translator => jit}/writelease.cpp | 4 +-- .../vm/{translator => jit}/writelease.h | 0 .../runtime/vm/{translator => jit}/x64-util.h | 2 +- hphp/runtime/vm/runtime.cpp | 4 +-- hphp/runtime/vm/runtime.h | 2 +- hphp/runtime/vm/treadmill.cpp | 2 +- hphp/runtime/vm/type_constraint.cpp | 2 +- hphp/runtime/vm/type_profile.cpp | 2 +- hphp/runtime/vm/unit.cpp | 6 ++--- 134 files changed, 293 insertions(+), 293 deletions(-) rename hphp/runtime/vm/{translator => jit}/abi-x64.h (99%) rename hphp/runtime/vm/{translator => jit}/annotation.cpp (97%) rename hphp/runtime/vm/{translator => jit}/annotation.h (96%) rename hphp/runtime/vm/{translator => jit}/asm-x64-test.cpp (100%) rename hphp/runtime/vm/{translator => jit}/asm-x64-test.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/block.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/cfg.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/check.cpp (97%) rename hphp/runtime/vm/{translator/hopt => jit}/check.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/codegen.cpp (99%) rename hphp/runtime/vm/{translator/hopt => jit}/codegen.h (98%) rename hphp/runtime/vm/{translator => jit}/collector.cpp (97%) rename hphp/runtime/vm/{translator/hopt => jit}/cse.h (94%) rename hphp/runtime/vm/{translator/hopt => jit}/dce.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/edge.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/extradata.h (99%) rename hphp/runtime/vm/{translator => jit}/fixup.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/hhbctranslator.cpp (99%) rename hphp/runtime/vm/{translator/hopt => jit}/hhbctranslator.h (99%) rename hphp/runtime/vm/{translator => jit}/hooks.h (100%) rename hphp/runtime/vm/{translator => jit}/immstack.cpp (98%) rename hphp/runtime/vm/{translator => jit}/immstack.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/ir.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/ir.h (99%) rename hphp/runtime/vm/{translator/hopt => jit}/irfactory.cpp (95%) rename hphp/runtime/vm/{translator/hopt => jit}/irfactory.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/irinstruction.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/irtranslator.cpp (99%) rename hphp/runtime/vm/{translator => jit}/jit.cfg (100%) rename hphp/runtime/vm/{translator/hopt => jit}/jumpopts.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/layout.cpp (96%) rename hphp/runtime/vm/{translator/hopt => jit}/layout.h (94%) rename hphp/runtime/vm/{translator/hopt => jit}/linearscan.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/linearscan.h (97%) rename hphp/runtime/vm/{translator => jit}/memcpy-x64.cpp (100%) rename hphp/runtime/vm/{translator/hopt => jit}/mutation.cpp (97%) rename hphp/runtime/vm/{translator/hopt => jit}/mutation.h (96%) rename hphp/runtime/vm/{translator/hopt => jit}/nativecalls.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/nativecalls.h (95%) rename hphp/runtime/vm/{translator/hopt => jit}/opt.cpp (95%) rename hphp/runtime/vm/{translator/hopt => jit}/opt.h (100%) rename hphp/runtime/vm/{translator => jit}/physreg.cpp (97%) rename hphp/runtime/vm/{translator => jit}/physreg.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/predictionopts.cpp (95%) rename hphp/runtime/vm/{translator/hopt => jit}/print.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/print.h (98%) rename hphp/runtime/vm/{translator => jit}/runtime-type.cpp (98%) rename hphp/runtime/vm/{translator => jit}/runtime-type.h (100%) rename hphp/runtime/vm/{translator/hopt => jit}/simplifier.cpp (99%) rename hphp/runtime/vm/{translator/hopt => jit}/simplifier.h (98%) rename hphp/runtime/vm/{translator => jit}/srcdb.cpp (98%) rename hphp/runtime/vm/{translator => jit}/srcdb.h (99%) rename hphp/runtime/vm/{translator/hopt => jit}/ssatmp.h (98%) rename hphp/runtime/vm/{translator/hopt => jit}/state_vector.h (98%) rename hphp/runtime/vm/{translator => jit}/targetcache.cpp (99%) rename hphp/runtime/vm/{translator => jit}/targetcache.h (99%) rename hphp/runtime/vm/{translator => jit}/test/fixup_map.cpp (98%) rename hphp/runtime/vm/{translator => jit}/test/main.cpp (100%) rename hphp/runtime/vm/{translator => jit}/test/tread_hash_map.cpp (100%) rename hphp/runtime/vm/{translator/hopt => jit}/test/type.cpp (99%) rename hphp/runtime/vm/{translator/hopt => jit}/test/vector.cpp (98%) rename hphp/runtime/vm/{translator/hopt => jit}/trace.h (97%) rename hphp/runtime/vm/{translator/hopt => jit}/tracebuilder.cpp (99%) rename hphp/runtime/vm/{translator/hopt => jit}/tracebuilder.h (98%) rename hphp/runtime/vm/{translator => jit}/trans-data.h (97%) rename hphp/runtime/vm/{translator => jit}/translator-asm-helpers.S (100%) rename hphp/runtime/vm/{translator => jit}/translator-inline.h (99%) rename hphp/runtime/vm/{translator => jit}/translator-runtime.cpp (99%) rename hphp/runtime/vm/{translator => jit}/translator-runtime.h (97%) rename hphp/runtime/vm/{translator => jit}/translator-x64-helpers.cpp (98%) rename hphp/runtime/vm/{translator => jit}/translator-x64-internal.h (99%) rename hphp/runtime/vm/{translator => jit}/translator-x64.cpp (99%) rename hphp/runtime/vm/{translator => jit}/translator-x64.h (99%) rename hphp/runtime/vm/{translator => jit}/translator.cpp (99%) rename hphp/runtime/vm/{translator => jit}/translator.h (99%) rename hphp/runtime/vm/{translator/hopt => jit}/type.cpp (97%) rename hphp/runtime/vm/{translator/hopt => jit}/type.h (99%) rename hphp/runtime/vm/{translator => jit}/types.h (100%) rename hphp/runtime/vm/{translator => jit}/unwind-x64.cpp (97%) rename hphp/runtime/vm/{translator => jit}/unwind-x64.h (94%) rename hphp/runtime/vm/{translator/hopt => jit}/vectortranslator-internal.h (99%) rename hphp/runtime/vm/{translator/hopt => jit}/vectortranslator.cpp (99%) rename hphp/runtime/vm/{translator => jit}/writelease.cpp (97%) rename hphp/runtime/vm/{translator => jit}/writelease.h (100%) rename hphp/runtime/vm/{translator => jit}/x64-util.h (97%) diff --git a/hphp/hhvm/process_init.cpp b/hphp/hhvm/process_init.cpp index ac0cc9421..3628f5cda 100644 --- a/hphp/hhvm/process_init.cpp +++ b/hphp/hhvm/process_init.cpp @@ -23,10 +23,10 @@ #include "hphp/runtime/vm/funcdict.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/fixup.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/fixup.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/eval/runtime/file_repository.h" #include "hphp/system/lib/systemlib.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/base/array/hphp_array_sort.cpp b/hphp/runtime/base/array/hphp_array_sort.cpp index 7cb5c64f1..b8008dea0 100644 --- a/hphp/runtime/base/array/hphp_array_sort.cpp +++ b/hphp/runtime/base/array/hphp_array_sort.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/base/array/sort_helpers.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/builtin_functions.cpp b/hphp/runtime/base/builtin_functions.cpp index db51dadb4..886c1eccf 100644 --- a/hphp/runtime/base/builtin_functions.cpp +++ b/hphp/runtime/base/builtin_functions.cpp @@ -35,8 +35,8 @@ #include "hphp/util/util.h" #include "hphp/util/process.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/event_hook.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/base/execution_context.cpp b/hphp/runtime/base/execution_context.cpp index 74f0a260c..6cc23fa47 100644 --- a/hphp/runtime/base/execution_context.cpp +++ b/hphp/runtime/base/execution_context.cpp @@ -39,8 +39,8 @@ #include "hphp/runtime/eval/debugger/debugger.h" #include "hphp/runtime/eval/runtime/file_repository.h" #include "hphp/runtime/ext/ext_string.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/debugger_hook.h" #include "hphp/runtime/vm/event_hook.h" diff --git a/hphp/runtime/base/file/user_file.cpp b/hphp/runtime/base/file/user_file.cpp index f6ba83a22..15732e78a 100644 --- a/hphp/runtime/base/file/user_file.cpp +++ b/hphp/runtime/base/file/user_file.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/file/user_file.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/vm/instance.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { diff --git a/hphp/runtime/base/hardware_counter.cpp b/hphp/runtime/base/hardware_counter.cpp index 60b8e5b9e..27db3012e 100644 --- a/hphp/runtime/base/hardware_counter.cpp +++ b/hphp/runtime/base/hardware_counter.cpp @@ -33,7 +33,7 @@ #include "hphp/runtime/base/string_data.h" #include "hphp/runtime/base/zend/zend_url.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/intercept.cpp b/hphp/runtime/base/intercept.cpp index 9c4438e60..b606cd7e7 100644 --- a/hphp/runtime/base/intercept.cpp +++ b/hphp/runtime/base/intercept.cpp @@ -19,7 +19,7 @@ #include "hphp/runtime/base/array/array_iterator.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/event_hook.h" @@ -27,7 +27,7 @@ #include "hphp/util/lock.h" #include "hphp/runtime/eval/runtime/file_repository.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/util/trace.h" using namespace HPHP::Trace; diff --git a/hphp/runtime/base/program_functions.cpp b/hphp/runtime/base/program_functions.cpp index 9e283c7c8..6bf0d5174 100644 --- a/hphp/runtime/base/program_functions.cpp +++ b/hphp/runtime/base/program_functions.cpp @@ -64,7 +64,7 @@ #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/compiler/builtin_symbols.h" using namespace boost::program_options; diff --git a/hphp/runtime/base/server/admin_request_handler.cpp b/hphp/runtime/base/server/admin_request_handler.cpp index 027fdcd13..52b91d874 100644 --- a/hphp/runtime/base/server/admin_request_handler.cpp +++ b/hphp/runtime/base/server/admin_request_handler.cpp @@ -34,8 +34,8 @@ #include "hphp/runtime/ext/mysql_stats.h" #include "hphp/runtime/base/shared/shared_store_stats.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/util/alloc.h" #include "hphp/util/timer.h" #include "hphp/util/repo_schema.h" diff --git a/hphp/runtime/base/stat_cache.cpp b/hphp/runtime/base/stat_cache.cpp index 2afed8094..eca50b2c8 100644 --- a/hphp/runtime/base/stat_cache.cpp +++ b/hphp/runtime/base/stat_cache.cpp @@ -24,7 +24,7 @@ #include "hphp/util/trace.h" #include "hphp/util/logger.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/vm/translator/hooks.h" +#include "hphp/runtime/vm/jit/hooks.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/base/stats.cpp b/hphp/runtime/base/stats.cpp index bbe472521..bf3aad067 100644 --- a/hphp/runtime/base/stats.cpp +++ b/hphp/runtime/base/stats.cpp @@ -14,8 +14,8 @@ +----------------------------------------------------------------------+ */ #include "hphp/util/base.h" -#include "hphp/runtime/vm/translator/x64-util.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/x64-util.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/stats.h" namespace HPHP { diff --git a/hphp/runtime/base/string_data.cpp b/hphp/runtime/base/string_data.cpp index 49d6e052f..59c6029c6 100644 --- a/hphp/runtime/base/string_data.cpp +++ b/hphp/runtime/base/string_data.cpp @@ -28,7 +28,7 @@ #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/base/type_conversions.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "tbb/concurrent_hash_map.h" namespace HPHP { diff --git a/hphp/runtime/base/thread_info.cpp b/hphp/runtime/base/thread_info.cpp index 8f93b552e..0b6c86186 100644 --- a/hphp/runtime/base/thread_info.cpp +++ b/hphp/runtime/base/thread_info.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/base/hphp_system.h" #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/base/memory/smart_allocator.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/util/lock.h" #include "hphp/util/alloc.h" diff --git a/hphp/runtime/base/type_variant.cpp b/hphp/runtime/base/type_variant.cpp index fc267c31b..620ebcdcc 100644 --- a/hphp/runtime/base/type_variant.cpp +++ b/hphp/runtime/base/type_variant.cpp @@ -25,7 +25,7 @@ #include "hphp/runtime/base/zend/zend_string.h" #include "hphp/runtime/base/array/array_iterator.h" #include "hphp/util/parser/hphp.tab.hpp" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/instance.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/eval/debugger/break_point.cpp b/hphp/runtime/eval/debugger/break_point.cpp index 7d7ec2b53..3624aa77d 100644 --- a/hphp/runtime/eval/debugger/break_point.cpp +++ b/hphp/runtime/eval/debugger/break_point.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/stat_cache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { namespace Eval { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/eval/debugger/debugger.cpp b/hphp/runtime/eval/debugger/debugger.cpp index 3273fd9fd..7182b7fb3 100644 --- a/hphp/runtime/eval/debugger/debugger.cpp +++ b/hphp/runtime/eval/debugger/debugger.cpp @@ -19,8 +19,8 @@ #include "hphp/runtime/eval/debugger/debugger_client.h" #include "hphp/runtime/eval/debugger/cmd/cmd_interrupt.h" #include "hphp/runtime/base/hphp_system.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/text_color.h" #include "hphp/util/util.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/eval/runtime/file_repository.cpp b/hphp/runtime/eval/runtime/file_repository.cpp index e4589f119..015917d2b 100644 --- a/hphp/runtime/eval/runtime/file_repository.cpp +++ b/hphp/runtime/eval/runtime/file_repository.cpp @@ -22,8 +22,8 @@ #include "hphp/runtime/base/stat_cache.h" #include "hphp/runtime/base/server/source_root_info.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/pendq.h" #include "hphp/runtime/vm/repo.h" diff --git a/hphp/runtime/ext/ext_array.cpp b/hphp/runtime/ext/ext_array.cpp index 7c30e391d..ddfa000b0 100644 --- a/hphp/runtime/ext/ext_array.cpp +++ b/hphp/runtime/ext/ext_array.cpp @@ -24,8 +24,8 @@ #include "hphp/runtime/base/zend/zend_collator.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/sort_flags.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/base/array/hphp_array.h" #include "hphp/util/logger.h" diff --git a/hphp/runtime/ext/ext_class.cpp b/hphp/runtime/ext/ext_class.cpp index 9d4191457..1bbf885a1 100644 --- a/hphp/runtime/ext/ext_class.cpp +++ b/hphp/runtime/ext/ext_class.cpp @@ -17,8 +17,8 @@ #include "hphp/runtime/ext/ext_class.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/util.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_closure.cpp b/hphp/runtime/ext/ext_closure.cpp index 1a7bb3b76..b58aef8ab 100644 --- a/hphp/runtime/ext/ext_closure.cpp +++ b/hphp/runtime/ext/ext_closure.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_collections.cpp b/hphp/runtime/ext/ext_collections.cpp index 0e4feac9a..2b3e04e27 100644 --- a/hphp/runtime/ext/ext_collections.cpp +++ b/hphp/runtime/ext/ext_collections.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/ext/ext_array.h" #include "hphp/runtime/ext/ext_math.h" #include "hphp/runtime/ext/ext_intl.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/system/lib/systemlib.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_continuation.cpp b/hphp/runtime/ext/ext_continuation.cpp index a99b0ec79..54f5c3626 100644 --- a/hphp/runtime/ext/ext_continuation.cpp +++ b/hphp/runtime/ext/ext_continuation.cpp @@ -23,8 +23,8 @@ #include "hphp/runtime/ext/ext_variable.h" #include "hphp/runtime/ext/ext_function.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/vm/func.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/stats.h" diff --git a/hphp/runtime/ext/ext_curl.cpp b/hphp/runtime/ext/ext_curl.cpp index 7d1577b76..b3e8cc1e8 100644 --- a/hphp/runtime/ext/ext_curl.cpp +++ b/hphp/runtime/ext/ext_curl.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/base/util/curl_tls_workarounds.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/server/server_stats.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #define CURLOPT_RETURNTRANSFER 19913 #define CURLOPT_BINARYTRANSFER 19914 diff --git a/hphp/runtime/ext/ext_debugger.cpp b/hphp/runtime/ext/ext_debugger.cpp index ca9dff574..104a8c029 100644 --- a/hphp/runtime/ext/ext_debugger.cpp +++ b/hphp/runtime/ext/ext_debugger.cpp @@ -20,7 +20,7 @@ #include "hphp/runtime/eval/debugger/cmd/cmd_user.h" #include "hphp/runtime/eval/debugger/cmd/cmd_interrupt.h" #include "hphp/runtime/vm/debugger_hook.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "tbb/concurrent_hash_map.h" #include "hphp/util/logger.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/ext/ext_domdocument.cpp b/hphp/runtime/ext/ext_domdocument.cpp index c68f7c9e3..941dda947 100644 --- a/hphp/runtime/ext/ext_domdocument.cpp +++ b/hphp/runtime/ext/ext_domdocument.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/runtime_error.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/ext/ext_simplexml.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/ext/ext_function.cpp b/hphp/runtime/ext/ext_function.cpp index 2bf90c52d..68b6455f6 100644 --- a/hphp/runtime/ext/ext_function.cpp +++ b/hphp/runtime/ext/ext_function.cpp @@ -23,8 +23,8 @@ #include "hphp/runtime/base/util/libevent_http_client.h" #include "hphp/runtime/base/server/http_protocol.h" #include "hphp/runtime/vm/runtime.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/exception.h" #include "hphp/util/util.h" diff --git a/hphp/runtime/ext/ext_icu_ucnv.cpp b/hphp/runtime/ext/ext_icu_ucnv.cpp index cb059bd8b..818a4fde4 100644 --- a/hphp/runtime/ext/ext_icu_ucnv.cpp +++ b/hphp/runtime/ext/ext_icu_ucnv.cpp @@ -16,7 +16,7 @@ */ #include "hphp/runtime/ext/ext_icu_ucnv.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/ext/ext_misc.cpp b/hphp/runtime/ext/ext_misc.cpp index 7a0e78d6f..341d980fa 100644 --- a/hphp/runtime/ext/ext_misc.cpp +++ b/hphp/runtime/ext/ext_misc.cpp @@ -28,8 +28,8 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/util/parser/scanner.h" #include "hphp/runtime/base/class_info.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { diff --git a/hphp/runtime/ext/ext_reflection.cpp b/hphp/runtime/ext/ext_reflection.cpp index b68b89b15..4ca6c77d5 100644 --- a/hphp/runtime/ext/ext_reflection.cpp +++ b/hphp/runtime/ext/ext_reflection.cpp @@ -21,7 +21,7 @@ #include "hphp/runtime/base/class_info.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/string_util.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/ext/ext_xml.cpp b/hphp/runtime/ext/ext_xml.cpp index ef9f4e01f..178c46e56 100644 --- a/hphp/runtime/ext/ext_xml.cpp +++ b/hphp/runtime/ext/ext_xml.cpp @@ -18,8 +18,8 @@ #include "hphp/runtime/ext/ext_xml.h" #include "hphp/runtime/base/zend/zend_functions.h" #include "hphp/runtime/base/zend/zend_string.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include namespace HPHP { diff --git a/hphp/runtime/vm/bytecode.cpp b/hphp/runtime/vm/bytecode.cpp index 952fe0ca4..7def15076 100644 --- a/hphp/runtime/vm/bytecode.cpp +++ b/hphp/runtime/vm/bytecode.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/compiler/builtin_symbols.h" #include "hphp/runtime/vm/event_hook.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/member_operations.h" #include "hphp/runtime/base/code_coverage.h" #include "hphp/runtime/eval/runtime/file_repository.h" @@ -36,9 +36,9 @@ #include "hphp/runtime/vm/php_debug.h" #include "hphp/runtime/vm/debugger_hook.h" #include "hphp/runtime/vm/runtime.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/vm/type_constraint.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/ext/ext_string.h" #include "hphp/runtime/ext/ext_error.h" #include "hphp/runtime/ext/ext_closure.h" diff --git a/hphp/runtime/vm/class.cpp b/hphp/runtime/vm/class.cpp index db5634c0e..8e9661e1a 100644 --- a/hphp/runtime/vm/class.cpp +++ b/hphp/runtime/vm/class.cpp @@ -23,8 +23,8 @@ #include "hphp/runtime/vm/core_types.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/blob_helper.h" #include "hphp/runtime/vm/treadmill.h" #include "hphp/runtime/vm/name_value_table.h" diff --git a/hphp/runtime/vm/debug/debug.cpp b/hphp/runtime/vm/debug/debug.cpp index 32a0e25f8..f9e56f8fc 100644 --- a/hphp/runtime/vm/debug/debug.cpp +++ b/hphp/runtime/vm/debug/debug.cpp @@ -26,7 +26,7 @@ #include #include -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" using namespace HPHP::Transl; diff --git a/hphp/runtime/vm/debug/debug.h b/hphp/runtime/vm/debug/debug.h index 1463a8a53..74a64d98c 100644 --- a/hphp/runtime/vm/debug/debug.h +++ b/hphp/runtime/vm/debug/debug.h @@ -17,7 +17,7 @@ #define TRANSLATOR_DEBUG_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/vm/debug/dwarf.h" diff --git a/hphp/runtime/vm/debug/dwarf.cpp b/hphp/runtime/vm/debug/dwarf.cpp index 408e19296..6b518a235 100644 --- a/hphp/runtime/vm/debug/dwarf.cpp +++ b/hphp/runtime/vm/debug/dwarf.cpp @@ -21,8 +21,8 @@ #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/execution_context.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" using namespace HPHP::Transl; diff --git a/hphp/runtime/vm/debug/dwarf.h b/hphp/runtime/vm/debug/dwarf.h index 948000112..98b5a07fb 100644 --- a/hphp/runtime/vm/debug/dwarf.h +++ b/hphp/runtime/vm/debug/dwarf.h @@ -19,7 +19,7 @@ #include #include "hphp/runtime/base/types.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include #include #include diff --git a/hphp/runtime/vm/debug/elfwriter.cpp b/hphp/runtime/vm/debug/elfwriter.cpp index c3d13a3ba..7fc03e29e 100644 --- a/hphp/runtime/vm/debug/elfwriter.cpp +++ b/hphp/runtime/vm/debug/elfwriter.cpp @@ -27,7 +27,7 @@ #include "hphp/util/asm-x64.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" using namespace HPHP::Transl; diff --git a/hphp/runtime/vm/debugger_hook.cpp b/hphp/runtime/vm/debugger_hook.cpp index 656b7adce..81441c555 100644 --- a/hphp/runtime/vm/debugger_hook.cpp +++ b/hphp/runtime/vm/debugger_hook.cpp @@ -15,7 +15,7 @@ */ #include "hphp/runtime/vm/debugger_hook.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/eval/debugger/break_point.h" #include "hphp/runtime/eval/debugger/debugger.h" #include "hphp/runtime/eval/debugger/debugger_proxy.h" diff --git a/hphp/runtime/vm/event_hook.cpp b/hphp/runtime/vm/event_hook.cpp index 65976a680..81fb2ef64 100644 --- a/hphp/runtime/vm/event_hook.cpp +++ b/hphp/runtime/vm/event_hook.cpp @@ -17,7 +17,7 @@ #include "hphp/runtime/vm/event_hook.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/vm/func.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/base/builtin_functions.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/ext/ext_function.h" diff --git a/hphp/runtime/vm/event_hook.h b/hphp/runtime/vm/event_hook.h index 9227c7b54..e0b40085b 100644 --- a/hphp/runtime/vm/event_hook.h +++ b/hphp/runtime/vm/event_hook.h @@ -18,7 +18,7 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/vm/bytecode.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" namespace HPHP { diff --git a/hphp/runtime/vm/func.cpp b/hphp/runtime/vm/func.cpp index 854a8d5a2..d2c84a91b 100644 --- a/hphp/runtime/vm/func.cpp +++ b/hphp/runtime/vm/func.cpp @@ -26,9 +26,9 @@ #include "hphp/runtime/vm/core_types.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/repo.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/eval/runtime/file_repository.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/blob_helper.h" #include "hphp/runtime/vm/func_inline.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/vm/funcdict.cpp b/hphp/runtime/vm/funcdict.cpp index 9a430314c..a895023c0 100644 --- a/hphp/runtime/vm/funcdict.cpp +++ b/hphp/runtime/vm/funcdict.cpp @@ -21,8 +21,8 @@ #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/ext_hhvm/ext_hhvm.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/vm/unit.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/vm/instance.cpp b/hphp/runtime/vm/instance.cpp index 3089fa596..ad4f64b44 100644 --- a/hphp/runtime/vm/instance.cpp +++ b/hphp/runtime/vm/instance.cpp @@ -22,7 +22,7 @@ #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/object_allocator_sizes.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/ext/ext_collections.h" #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/vm/translator/abi-x64.h b/hphp/runtime/vm/jit/abi-x64.h similarity index 99% rename from hphp/runtime/vm/translator/abi-x64.h rename to hphp/runtime/vm/jit/abi-x64.h index ee8047f49..75a41dbfe 100644 --- a/hphp/runtime/vm/translator/abi-x64.h +++ b/hphp/runtime/vm/jit/abi-x64.h @@ -27,7 +27,7 @@ #define incl_HPHP_VM_RUNTIME_TRANSLATOR_ABI_X64_H_ #include "hphp/util/asm-x64.h" -#include "hphp/runtime/vm/translator/physreg.h" +#include "hphp/runtime/vm/jit/physreg.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/annotation.cpp b/hphp/runtime/vm/jit/annotation.cpp similarity index 97% rename from hphp/runtime/vm/translator/annotation.cpp rename to hphp/runtime/vm/jit/annotation.cpp index 6a985234d..7c8f953a3 100644 --- a/hphp/runtime/vm/translator/annotation.cpp +++ b/hphp/runtime/vm/jit/annotation.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/annotation.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/annotation.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/util/base.h" namespace HPHP { diff --git a/hphp/runtime/vm/translator/annotation.h b/hphp/runtime/vm/jit/annotation.h similarity index 96% rename from hphp/runtime/vm/translator/annotation.h rename to hphp/runtime/vm/jit/annotation.h index 22ba0f59d..cd9a1ee22 100644 --- a/hphp/runtime/vm/translator/annotation.h +++ b/hphp/runtime/vm/jit/annotation.h @@ -16,7 +16,7 @@ #ifndef ANNOTATION_H_ #define ANNOTATION_H_ -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/asm-x64-test.cpp b/hphp/runtime/vm/jit/asm-x64-test.cpp similarity index 100% rename from hphp/runtime/vm/translator/asm-x64-test.cpp rename to hphp/runtime/vm/jit/asm-x64-test.cpp diff --git a/hphp/runtime/vm/translator/asm-x64-test.h b/hphp/runtime/vm/jit/asm-x64-test.h similarity index 100% rename from hphp/runtime/vm/translator/asm-x64-test.h rename to hphp/runtime/vm/jit/asm-x64-test.h diff --git a/hphp/runtime/vm/translator/hopt/block.h b/hphp/runtime/vm/jit/block.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/block.h rename to hphp/runtime/vm/jit/block.h index c6126123d..b730d6463 100644 --- a/hphp/runtime/vm/translator/hopt/block.h +++ b/hphp/runtime/vm/jit/block.h @@ -18,9 +18,9 @@ #define incl_HPHP_VM_BLOCK_H_ #include "hphp/runtime/base/memory/memory_manager.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/edge.h" -#include "hphp/runtime/vm/translator/hopt/irinstruction.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/edge.h" +#include "hphp/runtime/vm/jit/irinstruction.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/cfg.h b/hphp/runtime/vm/jit/cfg.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/cfg.h rename to hphp/runtime/vm/jit/cfg.h index 258cd4603..9df66aed2 100644 --- a/hphp/runtime/vm/translator/hopt/cfg.h +++ b/hphp/runtime/vm/jit/cfg.h @@ -20,8 +20,8 @@ #include #include "hphp/runtime/base/memory/memory_manager.h" -#include "hphp/runtime/vm/translator/hopt/block.h" -#include "hphp/runtime/vm/translator/hopt/trace.h" +#include "hphp/runtime/vm/jit/block.h" +#include "hphp/runtime/vm/jit/trace.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/check.cpp b/hphp/runtime/vm/jit/check.cpp similarity index 97% rename from hphp/runtime/vm/translator/hopt/check.cpp rename to hphp/runtime/vm/jit/check.cpp index 7d7e7ad1d..b97785cdd 100644 --- a/hphp/runtime/vm/translator/hopt/check.cpp +++ b/hphp/runtime/vm/jit/check.cpp @@ -13,15 +13,15 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/check.h" +#include "hphp/runtime/vm/jit/check.h" #include #include -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/physreg.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/physreg.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/check.h b/hphp/runtime/vm/jit/check.h similarity index 100% rename from hphp/runtime/vm/translator/hopt/check.h rename to hphp/runtime/vm/jit/check.h diff --git a/hphp/runtime/vm/translator/hopt/codegen.cpp b/hphp/runtime/vm/jit/codegen.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/codegen.cpp rename to hphp/runtime/vm/jit/codegen.cpp index f60759ad4..64cca0ba3 100644 --- a/hphp/runtime/vm/translator/hopt/codegen.cpp +++ b/hphp/runtime/vm/jit/codegen.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/codegen.h" +#include "hphp/runtime/vm/jit/codegen.h" #include #include @@ -36,18 +36,18 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" -#include "hphp/runtime/vm/translator/translator-x64-internal.h" -#include "hphp/runtime/vm/translator/translator.h" -#include "hphp/runtime/vm/translator/types.h" -#include "hphp/runtime/vm/translator/x64-util.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/hopt/nativecalls.h" -#include "hphp/runtime/vm/translator/hopt/print.h" -#include "hphp/runtime/vm/translator/hopt/layout.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64-internal.h" +#include "hphp/runtime/vm/jit/translator.h" +#include "hphp/runtime/vm/jit/types.h" +#include "hphp/runtime/vm/jit/x64-util.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/nativecalls.h" +#include "hphp/runtime/vm/jit/print.h" +#include "hphp/runtime/vm/jit/layout.h" using HPHP::Transl::TCA; using namespace HPHP::Transl::TargetCache; diff --git a/hphp/runtime/vm/translator/hopt/codegen.h b/hphp/runtime/vm/jit/codegen.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/codegen.h rename to hphp/runtime/vm/jit/codegen.h index 69af791f3..8b8962b77 100644 --- a/hphp/runtime/vm/translator/hopt/codegen.h +++ b/hphp/runtime/vm/jit/codegen.h @@ -18,12 +18,12 @@ #define incl_HPHP_VM_CG_H_ #include -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-x64.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-x64.h" +#include "hphp/runtime/vm/jit/state_vector.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/collector.cpp b/hphp/runtime/vm/jit/collector.cpp similarity index 97% rename from hphp/runtime/vm/translator/collector.cpp rename to hphp/runtime/vm/jit/collector.cpp index 3bcecee52..3fa27d447 100644 --- a/hphp/runtime/vm/translator/collector.cpp +++ b/hphp/runtime/vm/jit/collector.cpp @@ -29,8 +29,8 @@ #include "hphp/runtime/eval/runtime/file_repository.h" #include "hphp/system/lib/systemlib.h" #include "hphp/runtime/vm/treadmill.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/hopt/cse.h b/hphp/runtime/vm/jit/cse.h similarity index 94% rename from hphp/runtime/vm/translator/hopt/cse.h rename to hphp/runtime/vm/jit/cse.h index 19346d297..d85490bb1 100644 --- a/hphp/runtime/vm/translator/hopt/cse.h +++ b/hphp/runtime/vm/jit/cse.h @@ -21,9 +21,9 @@ #include "folly/Hash.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/cfg.h" -#include "hphp/runtime/vm/translator/hopt/ssatmp.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/cfg.h" +#include "hphp/runtime/vm/jit/ssatmp.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/dce.cpp b/hphp/runtime/vm/jit/dce.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/dce.cpp rename to hphp/runtime/vm/jit/dce.cpp index e3522dd90..16064fa3d 100644 --- a/hphp/runtime/vm/translator/hopt/dce.cpp +++ b/hphp/runtime/vm/jit/dce.cpp @@ -17,12 +17,12 @@ #include #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/opt.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/simplifier.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" -#include "hphp/runtime/vm/translator/hopt/mutation.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/opt.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/simplifier.h" +#include "hphp/runtime/vm/jit/state_vector.h" +#include "hphp/runtime/vm/jit/mutation.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/edge.h b/hphp/runtime/vm/jit/edge.h similarity index 100% rename from hphp/runtime/vm/translator/hopt/edge.h rename to hphp/runtime/vm/jit/edge.h diff --git a/hphp/runtime/vm/translator/hopt/extradata.h b/hphp/runtime/vm/jit/extradata.h similarity index 99% rename from hphp/runtime/vm/translator/hopt/extradata.h rename to hphp/runtime/vm/jit/extradata.h index af27d9334..b9d1aac39 100644 --- a/hphp/runtime/vm/translator/hopt/extradata.h +++ b/hphp/runtime/vm/jit/extradata.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_VM_EXTRADATA_H_ #define incl_HPHP_VM_EXTRADATA_H_ -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/fixup.h b/hphp/runtime/vm/jit/fixup.h similarity index 98% rename from hphp/runtime/vm/translator/fixup.h rename to hphp/runtime/vm/jit/fixup.h index 04c4dfb4a..3d933fa9c 100644 --- a/hphp/runtime/vm/translator/fixup.h +++ b/hphp/runtime/vm/jit/fixup.h @@ -18,10 +18,10 @@ #define incl_HPHP_FIXUP_H_ #include "hphp/util/util.h" -#include "hphp/runtime/vm/translator/types.h" +#include "hphp/runtime/vm/jit/types.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/vm/tread_hash_map.h" -#include "hphp/runtime/vm/translator/types.h" +#include "hphp/runtime/vm/jit/types.h" #include "hphp/util/atomic.h" namespace HPHP { diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp b/hphp/runtime/vm/jit/hhbctranslator.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/hhbctranslator.cpp rename to hphp/runtime/vm/jit/hhbctranslator.cpp index d795d2ade..155247f94 100644 --- a/hphp/runtime/vm/translator/hopt/hhbctranslator.cpp +++ b/hphp/runtime/vm/jit/hhbctranslator.cpp @@ -13,18 +13,18 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h" +#include "hphp/runtime/vm/jit/hhbctranslator.h" #include "hphp/util/trace.h" #include "hphp/runtime/ext/ext_closure.h" #include "hphp/runtime/ext/ext_continuation.h" -#include "hphp/runtime/vm/translator/translator-runtime.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-runtime.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/runtime.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/codegen.h" // ArrayIdx helpers +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/codegen.h" // ArrayIdx helpers // Include last to localize effects to this file #include "hphp/util/assert_throw.h" diff --git a/hphp/runtime/vm/translator/hopt/hhbctranslator.h b/hphp/runtime/vm/jit/hhbctranslator.h similarity index 99% rename from hphp/runtime/vm/translator/hopt/hhbctranslator.h rename to hphp/runtime/vm/jit/hhbctranslator.h index 7c4478ef7..bc95bec11 100644 --- a/hphp/runtime/vm/translator/hopt/hhbctranslator.h +++ b/hphp/runtime/vm/jit/hhbctranslator.h @@ -24,8 +24,8 @@ #include "hphp/util/assertions.h" #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/member_operations.h" -#include "hphp/runtime/vm/translator/runtime-type.h" -#include "hphp/runtime/vm/translator/hopt/tracebuilder.h" +#include "hphp/runtime/vm/jit/runtime-type.h" +#include "hphp/runtime/vm/jit/tracebuilder.h" using HPHP::Transl::SrcKey; using HPHP::Transl::NormalizedInstruction; diff --git a/hphp/runtime/vm/translator/hooks.h b/hphp/runtime/vm/jit/hooks.h similarity index 100% rename from hphp/runtime/vm/translator/hooks.h rename to hphp/runtime/vm/jit/hooks.h diff --git a/hphp/runtime/vm/translator/immstack.cpp b/hphp/runtime/vm/jit/immstack.cpp similarity index 98% rename from hphp/runtime/vm/translator/immstack.cpp rename to hphp/runtime/vm/jit/immstack.cpp index cae3e94cd..fe8f0c5ea 100644 --- a/hphp/runtime/vm/translator/immstack.cpp +++ b/hphp/runtime/vm/jit/immstack.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/immstack.h" +#include "hphp/runtime/vm/jit/immstack.h" namespace HPHP { /////////////////////////////////////////////////////////////////////////////// diff --git a/hphp/runtime/vm/translator/immstack.h b/hphp/runtime/vm/jit/immstack.h similarity index 100% rename from hphp/runtime/vm/translator/immstack.h rename to hphp/runtime/vm/jit/immstack.h diff --git a/hphp/runtime/vm/translator/hopt/ir.cpp b/hphp/runtime/vm/jit/ir.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/ir.cpp rename to hphp/runtime/vm/jit/ir.cpp index 79fa020b8..f82e25970 100644 --- a/hphp/runtime/vm/translator/hopt/ir.cpp +++ b/hphp/runtime/vm/jit/ir.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/ir.h" #include #include @@ -30,13 +30,13 @@ #include "hphp/runtime/base/string_data.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/hopt/cse.h" -#include "hphp/runtime/vm/translator/hopt/irinstruction.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/hopt/print.h" -#include "hphp/runtime/vm/translator/hopt/simplifier.h" -#include "hphp/runtime/vm/translator/hopt/trace.h" +#include "hphp/runtime/vm/jit/cse.h" +#include "hphp/runtime/vm/jit/irinstruction.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/print.h" +#include "hphp/runtime/vm/jit/simplifier.h" +#include "hphp/runtime/vm/jit/trace.h" // Include last to localize effects to this file #include "hphp/util/assert_throw.h" diff --git a/hphp/runtime/vm/translator/hopt/ir.h b/hphp/runtime/vm/jit/ir.h similarity index 99% rename from hphp/runtime/vm/translator/hopt/ir.h rename to hphp/runtime/vm/jit/ir.h index 5e06f6cff..b49657f75 100644 --- a/hphp/runtime/vm/translator/hopt/ir.h +++ b/hphp/runtime/vm/jit/ir.h @@ -39,12 +39,12 @@ #include "hphp/util/asm-x64.h" #include "hphp/util/trace.h" #include "hphp/runtime/ext/ext_continuation.h" -#include "hphp/runtime/vm/translator/physreg.h" -#include "hphp/runtime/vm/translator/abi-x64.h" -#include "hphp/runtime/vm/translator/types.h" -#include "hphp/runtime/vm/translator/runtime-type.h" -#include "hphp/runtime/vm/translator/translator-runtime.h" -#include "hphp/runtime/vm/translator/hopt/type.h" +#include "hphp/runtime/vm/jit/physreg.h" +#include "hphp/runtime/vm/jit/abi-x64.h" +#include "hphp/runtime/vm/jit/types.h" +#include "hphp/runtime/vm/jit/runtime-type.h" +#include "hphp/runtime/vm/jit/translator-runtime.h" +#include "hphp/runtime/vm/jit/type.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/vm/func.h" #include "hphp/runtime/vm/class.h" diff --git a/hphp/runtime/vm/translator/hopt/irfactory.cpp b/hphp/runtime/vm/jit/irfactory.cpp similarity index 95% rename from hphp/runtime/vm/translator/hopt/irfactory.cpp rename to hphp/runtime/vm/jit/irfactory.cpp index 3f5b42b38..be1748aff 100644 --- a/hphp/runtime/vm/translator/hopt/irfactory.cpp +++ b/hphp/runtime/vm/jit/irfactory.cpp @@ -14,9 +14,9 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/irfactory.h" +#include "hphp/runtime/vm/jit/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/block.h" +#include "hphp/runtime/vm/jit/block.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/irfactory.h b/hphp/runtime/vm/jit/irfactory.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/irfactory.h rename to hphp/runtime/vm/jit/irfactory.h index d3794d882..601070877 100644 --- a/hphp/runtime/vm/translator/hopt/irfactory.h +++ b/hphp/runtime/vm/jit/irfactory.h @@ -22,8 +22,8 @@ #include "folly/ScopeGuard.h" #include "hphp/util/arena.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/cse.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/cse.h" #include "hphp/runtime/base/memory/memory_manager.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/irinstruction.h b/hphp/runtime/vm/jit/irinstruction.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/irinstruction.h rename to hphp/runtime/vm/jit/irinstruction.h index bcd44f361..b1bf8200d 100644 --- a/hphp/runtime/vm/translator/hopt/irinstruction.h +++ b/hphp/runtime/vm/jit/irinstruction.h @@ -17,9 +17,9 @@ #ifndef incl_HPHP_VM_IRINSTRUCTION_H_ #define incl_HPHP_VM_IRINSTRUCTION_H_ -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/edge.h" -#include "hphp/runtime/vm/translator/hopt/extradata.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/edge.h" +#include "hphp/runtime/vm/jit/extradata.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/irtranslator.cpp b/hphp/runtime/vm/jit/irtranslator.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/irtranslator.cpp rename to hphp/runtime/vm/jit/irtranslator.cpp index 5f84be491..0cb34aa5a 100644 --- a/hphp/runtime/vm/translator/hopt/irtranslator.cpp +++ b/hphp/runtime/vm/jit/irtranslator.cpp @@ -26,18 +26,18 @@ #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/runtime_option.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/opt.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/hopt/codegen.h" -#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h" -#include "hphp/runtime/vm/translator/hopt/print.h" -#include "hphp/runtime/vm/translator/hopt/check.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/opt.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/codegen.h" +#include "hphp/runtime/vm/jit/hhbctranslator.h" +#include "hphp/runtime/vm/jit/print.h" +#include "hphp/runtime/vm/jit/check.h" // Include last to localize effects to this file #include "hphp/util/assert_throw.h" diff --git a/hphp/runtime/vm/translator/jit.cfg b/hphp/runtime/vm/jit/jit.cfg similarity index 100% rename from hphp/runtime/vm/translator/jit.cfg rename to hphp/runtime/vm/jit/jit.cfg diff --git a/hphp/runtime/vm/translator/hopt/jumpopts.cpp b/hphp/runtime/vm/jit/jumpopts.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/jumpopts.cpp rename to hphp/runtime/vm/jit/jumpopts.cpp index 22d9f7bdc..1d01627d2 100644 --- a/hphp/runtime/vm/translator/hopt/jumpopts.cpp +++ b/hphp/runtime/vm/jit/jumpopts.cpp @@ -18,9 +18,9 @@ #include -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/opt.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/opt.h" +#include "hphp/runtime/vm/jit/irfactory.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/layout.cpp b/hphp/runtime/vm/jit/layout.cpp similarity index 96% rename from hphp/runtime/vm/translator/hopt/layout.cpp rename to hphp/runtime/vm/jit/layout.cpp index ab1eb6284..6f067747c 100644 --- a/hphp/runtime/vm/translator/hopt/layout.cpp +++ b/hphp/runtime/vm/jit/layout.cpp @@ -13,11 +13,11 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/layout.h" +#include "hphp/runtime/vm/jit/layout.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/hopt/cfg.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" +#include "hphp/runtime/vm/jit/cfg.h" +#include "hphp/runtime/vm/jit/state_vector.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/layout.h b/hphp/runtime/vm/jit/layout.h similarity index 94% rename from hphp/runtime/vm/translator/hopt/layout.h rename to hphp/runtime/vm/jit/layout.h index 726674a13..237ddbd43 100644 --- a/hphp/runtime/vm/translator/hopt/layout.h +++ b/hphp/runtime/vm/jit/layout.h @@ -17,8 +17,8 @@ #define incl_HPHP_JIT_LAYOUT_H_ #include "hphp/runtime/base/memory/memory_manager.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/block.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/block.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/linearscan.cpp b/hphp/runtime/vm/jit/linearscan.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/linearscan.cpp rename to hphp/runtime/vm/jit/linearscan.cpp index 69404ad08..46c2557c0 100644 --- a/hphp/runtime/vm/translator/hopt/linearscan.cpp +++ b/hphp/runtime/vm/jit/linearscan.cpp @@ -14,18 +14,18 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/linearscan.h" +#include "hphp/runtime/vm/jit/linearscan.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/nativecalls.h" -#include "hphp/runtime/vm/translator/hopt/print.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/tracebuilder.h" -#include "hphp/runtime/vm/translator/hopt/codegen.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" -#include "hphp/runtime/vm/translator/hopt/check.h" -#include "hphp/runtime/vm/translator/physreg.h" -#include "hphp/runtime/vm/translator/abi-x64.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/nativecalls.h" +#include "hphp/runtime/vm/jit/print.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/tracebuilder.h" +#include "hphp/runtime/vm/jit/codegen.h" +#include "hphp/runtime/vm/jit/state_vector.h" +#include "hphp/runtime/vm/jit/check.h" +#include "hphp/runtime/vm/jit/physreg.h" +#include "hphp/runtime/vm/jit/abi-x64.h" #include namespace HPHP { diff --git a/hphp/runtime/vm/translator/hopt/linearscan.h b/hphp/runtime/vm/jit/linearscan.h similarity index 97% rename from hphp/runtime/vm/translator/hopt/linearscan.h rename to hphp/runtime/vm/jit/linearscan.h index ff69f8e2d..5abfcd193 100644 --- a/hphp/runtime/vm/translator/hopt/linearscan.h +++ b/hphp/runtime/vm/jit/linearscan.h @@ -17,9 +17,9 @@ #ifndef incl_HPHP_VM_LINEAR_SCAN_H_ #define incl_HPHP_VM_LINEAR_SCAN_H_ -#include "hphp/runtime/vm/translator/hopt/state_vector.h" -#include "hphp/runtime/vm/translator/physreg.h" -#include "hphp/runtime/vm/translator/abi-x64.h" +#include "hphp/runtime/vm/jit/state_vector.h" +#include "hphp/runtime/vm/jit/physreg.h" +#include "hphp/runtime/vm/jit/abi-x64.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/memcpy-x64.cpp b/hphp/runtime/vm/jit/memcpy-x64.cpp similarity index 100% rename from hphp/runtime/vm/translator/memcpy-x64.cpp rename to hphp/runtime/vm/jit/memcpy-x64.cpp diff --git a/hphp/runtime/vm/translator/hopt/mutation.cpp b/hphp/runtime/vm/jit/mutation.cpp similarity index 97% rename from hphp/runtime/vm/translator/hopt/mutation.cpp rename to hphp/runtime/vm/jit/mutation.cpp index 311c46e03..bd9d47fc5 100644 --- a/hphp/runtime/vm/translator/hopt/mutation.cpp +++ b/hphp/runtime/vm/jit/mutation.cpp @@ -13,8 +13,8 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/mutation.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" +#include "hphp/runtime/vm/jit/mutation.h" +#include "hphp/runtime/vm/jit/state_vector.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/mutation.h b/hphp/runtime/vm/jit/mutation.h similarity index 96% rename from hphp/runtime/vm/translator/hopt/mutation.h rename to hphp/runtime/vm/jit/mutation.h index 25cc1fe78..4e11dc2d3 100644 --- a/hphp/runtime/vm/translator/hopt/mutation.h +++ b/hphp/runtime/vm/jit/mutation.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_JIT_MUTATION_H_ #define incl_HPHP_JIT_MUTATION_H_ -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/cfg.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/cfg.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/nativecalls.cpp b/hphp/runtime/vm/jit/nativecalls.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/nativecalls.cpp rename to hphp/runtime/vm/jit/nativecalls.cpp index 96d18e1b4..f85fbeb37 100644 --- a/hphp/runtime/vm/translator/hopt/nativecalls.cpp +++ b/hphp/runtime/vm/jit/nativecalls.cpp @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/nativecalls.h" +#include "hphp/runtime/vm/jit/nativecalls.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-runtime.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-runtime.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { namespace NativeCalls { diff --git a/hphp/runtime/vm/translator/hopt/nativecalls.h b/hphp/runtime/vm/jit/nativecalls.h similarity index 95% rename from hphp/runtime/vm/translator/hopt/nativecalls.h rename to hphp/runtime/vm/jit/nativecalls.h index 32ab15494..8ae4acb8f 100644 --- a/hphp/runtime/vm/translator/hopt/nativecalls.h +++ b/hphp/runtime/vm/jit/nativecalls.h @@ -20,8 +20,8 @@ #include #include -#include "hphp/runtime/vm/translator/types.h" -#include "hphp/runtime/vm/translator/hopt/codegen.h" +#include "hphp/runtime/vm/jit/types.h" +#include "hphp/runtime/vm/jit/codegen.h" namespace HPHP { namespace JIT { namespace NativeCalls { diff --git a/hphp/runtime/vm/translator/hopt/opt.cpp b/hphp/runtime/vm/jit/opt.cpp similarity index 95% rename from hphp/runtime/vm/translator/hopt/opt.cpp rename to hphp/runtime/vm/jit/opt.cpp index d7c439364..767e9735a 100644 --- a/hphp/runtime/vm/translator/hopt/opt.cpp +++ b/hphp/runtime/vm/jit/opt.cpp @@ -13,12 +13,12 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/opt.h" -#include "hphp/runtime/vm/translator/hopt/tracebuilder.h" +#include "hphp/runtime/vm/jit/opt.h" +#include "hphp/runtime/vm/jit/tracebuilder.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/print.h" -#include "hphp/runtime/vm/translator/hopt/check.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/print.h" +#include "hphp/runtime/vm/jit/check.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/opt.h b/hphp/runtime/vm/jit/opt.h similarity index 100% rename from hphp/runtime/vm/translator/hopt/opt.h rename to hphp/runtime/vm/jit/opt.h diff --git a/hphp/runtime/vm/translator/physreg.cpp b/hphp/runtime/vm/jit/physreg.cpp similarity index 97% rename from hphp/runtime/vm/translator/physreg.cpp rename to hphp/runtime/vm/jit/physreg.cpp index 4fead77bc..fac0136d4 100644 --- a/hphp/runtime/vm/translator/physreg.cpp +++ b/hphp/runtime/vm/jit/physreg.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/physreg.h" +#include "hphp/runtime/vm/jit/physreg.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/physreg.h b/hphp/runtime/vm/jit/physreg.h similarity index 100% rename from hphp/runtime/vm/translator/physreg.h rename to hphp/runtime/vm/jit/physreg.h diff --git a/hphp/runtime/vm/translator/hopt/predictionopts.cpp b/hphp/runtime/vm/jit/predictionopts.cpp similarity index 95% rename from hphp/runtime/vm/translator/hopt/predictionopts.cpp rename to hphp/runtime/vm/jit/predictionopts.cpp index a351e7006..913e45ca1 100644 --- a/hphp/runtime/vm/translator/hopt/predictionopts.cpp +++ b/hphp/runtime/vm/jit/predictionopts.cpp @@ -19,11 +19,11 @@ #include "folly/Optional.h" #include "folly/Lazy.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/cfg.h" -#include "hphp/runtime/vm/translator/hopt/mutation.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/state_vector.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/cfg.h" +#include "hphp/runtime/vm/jit/mutation.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/print.cpp b/hphp/runtime/vm/jit/print.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/print.cpp rename to hphp/runtime/vm/jit/print.cpp index fca31de72..5c9c3431d 100644 --- a/hphp/runtime/vm/translator/hopt/print.cpp +++ b/hphp/runtime/vm/jit/print.cpp @@ -14,11 +14,11 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/print.h" +#include "hphp/runtime/vm/jit/print.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" -#include "hphp/runtime/vm/translator/hopt/codegen.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/linearscan.h" +#include "hphp/runtime/vm/jit/codegen.h" #include "hphp/runtime/base/stats.h" #include "hphp/util/disasm.h" #include "hphp/util/text_color.h" diff --git a/hphp/runtime/vm/translator/hopt/print.h b/hphp/runtime/vm/jit/print.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/print.h rename to hphp/runtime/vm/jit/print.h index 7914d638e..c20595fff 100644 --- a/hphp/runtime/vm/translator/hopt/print.h +++ b/hphp/runtime/vm/jit/print.h @@ -19,7 +19,7 @@ #include #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/hopt/linearscan.h" +#include "hphp/runtime/vm/jit/linearscan.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/runtime-type.cpp b/hphp/runtime/vm/jit/runtime-type.cpp similarity index 98% rename from hphp/runtime/vm/translator/runtime-type.cpp rename to hphp/runtime/vm/jit/runtime-type.cpp index 1c984d89c..5e365d1ff 100644 --- a/hphp/runtime/vm/translator/runtime-type.cpp +++ b/hphp/runtime/vm/jit/runtime-type.cpp @@ -13,14 +13,14 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/runtime-type.h" +#include "hphp/runtime/vm/jit/runtime-type.h" #include #include #include #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/base/types.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/runtime-type.h b/hphp/runtime/vm/jit/runtime-type.h similarity index 100% rename from hphp/runtime/vm/translator/runtime-type.h rename to hphp/runtime/vm/jit/runtime-type.h diff --git a/hphp/runtime/vm/translator/hopt/simplifier.cpp b/hphp/runtime/vm/jit/simplifier.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/simplifier.cpp rename to hphp/runtime/vm/jit/simplifier.cpp index d72233876..e71247bc6 100644 --- a/hphp/runtime/vm/translator/hopt/simplifier.cpp +++ b/hphp/runtime/vm/jit/simplifier.cpp @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/simplifier.h" +#include "hphp/runtime/vm/jit/simplifier.h" #include #include #include "hphp/runtime/base/type_conversions.h" -#include "hphp/runtime/vm/translator/hopt/tracebuilder.h" +#include "hphp/runtime/vm/jit/tracebuilder.h" #include "hphp/runtime/vm/runtime.h" namespace HPHP { diff --git a/hphp/runtime/vm/translator/hopt/simplifier.h b/hphp/runtime/vm/jit/simplifier.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/simplifier.h rename to hphp/runtime/vm/jit/simplifier.h index 8feaea1c4..ce3343827 100644 --- a/hphp/runtime/vm/translator/hopt/simplifier.h +++ b/hphp/runtime/vm/jit/simplifier.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ #define incl_HPHP_HHVM_HHIR_SIMPLIFIER_H_ -#include "hphp/runtime/vm/translator/hopt/cse.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/cse.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/srcdb.cpp b/hphp/runtime/vm/jit/srcdb.cpp similarity index 98% rename from hphp/runtime/vm/translator/srcdb.cpp rename to hphp/runtime/vm/jit/srcdb.cpp index 7adf024a4..b1c5160ec 100644 --- a/hphp/runtime/vm/translator/srcdb.cpp +++ b/hphp/runtime/vm/jit/srcdb.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/srcdb.h" +#include "hphp/runtime/vm/jit/srcdb.h" #include #include @@ -21,7 +21,7 @@ #include "hphp/util/base.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/srcdb.h b/hphp/runtime/vm/jit/srcdb.h similarity index 99% rename from hphp/runtime/vm/translator/srcdb.h rename to hphp/runtime/vm/jit/srcdb.h index 051a55bc5..fd50ecb88 100644 --- a/hphp/runtime/vm/translator/srcdb.h +++ b/hphp/runtime/vm/jit/srcdb.h @@ -21,7 +21,7 @@ #include "hphp/util/asm-x64.h" #include "hphp/util/trace.h" #include "hphp/util/mutex.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/tread_hash_map.h" namespace HPHP { diff --git a/hphp/runtime/vm/translator/hopt/ssatmp.h b/hphp/runtime/vm/jit/ssatmp.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/ssatmp.h rename to hphp/runtime/vm/jit/ssatmp.h index 8270edd06..2e2210012 100644 --- a/hphp/runtime/vm/translator/hopt/ssatmp.h +++ b/hphp/runtime/vm/jit/ssatmp.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_VM_SSATMP_H_ #define incl_HPHP_VM_SSATMP_H_ -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/state_vector.h b/hphp/runtime/vm/jit/state_vector.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/state_vector.h rename to hphp/runtime/vm/jit/state_vector.h index d4f43cf2b..c12620364 100644 --- a/hphp/runtime/vm/translator/hopt/state_vector.h +++ b/hphp/runtime/vm/jit/state_vector.h @@ -20,7 +20,7 @@ #include #include "hphp/runtime/base/memory/memory_manager.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" +#include "hphp/runtime/vm/jit/irfactory.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/targetcache.cpp b/hphp/runtime/vm/jit/targetcache.cpp similarity index 99% rename from hphp/runtime/vm/translator/targetcache.cpp rename to hphp/runtime/vm/jit/targetcache.cpp index fee28cea3..f05a74bb7 100644 --- a/hphp/runtime/vm/translator/targetcache.cpp +++ b/hphp/runtime/vm/jit/targetcache.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/base/complex_types.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/base/types.h" @@ -21,8 +21,8 @@ #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/runtime.h" -#include "hphp/runtime/vm/translator/annotation.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/annotation.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/base/stats.h" #include "hphp/util/trace.h" #include "hphp/util/base.h" diff --git a/hphp/runtime/vm/translator/targetcache.h b/hphp/runtime/vm/jit/targetcache.h similarity index 99% rename from hphp/runtime/vm/translator/targetcache.h rename to hphp/runtime/vm/jit/targetcache.h index 00c72fece..7e8c566b3 100644 --- a/hphp/runtime/vm/translator/targetcache.h +++ b/hphp/runtime/vm/jit/targetcache.h @@ -18,8 +18,8 @@ #include "hphp/runtime/vm/func.h" #include "hphp/util/util.h" -#include "hphp/runtime/vm/translator/types.h" -#include "hphp/runtime/vm/translator/unwind-x64.h" +#include "hphp/runtime/vm/jit/types.h" +#include "hphp/runtime/vm/jit/unwind-x64.h" #include "hphp/util/asm-x64.h" #include diff --git a/hphp/runtime/vm/translator/test/fixup_map.cpp b/hphp/runtime/vm/jit/test/fixup_map.cpp similarity index 98% rename from hphp/runtime/vm/translator/test/fixup_map.cpp rename to hphp/runtime/vm/jit/test/fixup_map.cpp index debd15706..f4426ae4c 100644 --- a/hphp/runtime/vm/translator/test/fixup_map.cpp +++ b/hphp/runtime/vm/jit/test/fixup_map.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/fixup.h" +#include "hphp/runtime/vm/jit/fixup.h" #include "gtest/gtest.h" #include "hphp/hhvm/process_init.h" diff --git a/hphp/runtime/vm/translator/test/main.cpp b/hphp/runtime/vm/jit/test/main.cpp similarity index 100% rename from hphp/runtime/vm/translator/test/main.cpp rename to hphp/runtime/vm/jit/test/main.cpp diff --git a/hphp/runtime/vm/translator/test/tread_hash_map.cpp b/hphp/runtime/vm/jit/test/tread_hash_map.cpp similarity index 100% rename from hphp/runtime/vm/translator/test/tread_hash_map.cpp rename to hphp/runtime/vm/jit/test/tread_hash_map.cpp diff --git a/hphp/runtime/vm/translator/hopt/test/type.cpp b/hphp/runtime/vm/jit/test/type.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/test/type.cpp rename to hphp/runtime/vm/jit/test/type.cpp index d9d8d2f59..0995e32f7 100644 --- a/hphp/runtime/vm/translator/hopt/test/type.cpp +++ b/hphp/runtime/vm/jit/test/type.cpp @@ -17,7 +17,7 @@ #include "gtest/gtest.h" #include "hphp/util/base.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/ir.h" // for specialized object tests to get some real VM::Class #include "hphp/system/lib/systemlib.h" diff --git a/hphp/runtime/vm/translator/hopt/test/vector.cpp b/hphp/runtime/vm/jit/test/vector.cpp similarity index 98% rename from hphp/runtime/vm/translator/hopt/test/vector.cpp rename to hphp/runtime/vm/jit/test/vector.cpp index cfacc025d..7aa02c487 100644 --- a/hphp/runtime/vm/translator/hopt/test/vector.cpp +++ b/hphp/runtime/vm/jit/test/vector.cpp @@ -19,7 +19,7 @@ #include "folly/Format.h" #include "hphp/util/base.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/trace.h b/hphp/runtime/vm/jit/trace.h similarity index 97% rename from hphp/runtime/vm/translator/hopt/trace.h rename to hphp/runtime/vm/jit/trace.h index 108400b75..bad0f7509 100644 --- a/hphp/runtime/vm/translator/hopt/trace.h +++ b/hphp/runtime/vm/jit/trace.h @@ -17,8 +17,8 @@ #ifndef incl_HPHP_VM_TRACE_H_ #define incl_HPHP_VM_TRACE_H_ -#include "hphp/runtime/vm/translator/hopt/block.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" +#include "hphp/runtime/vm/jit/block.h" +#include "hphp/runtime/vm/jit/ir.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/tracebuilder.cpp b/hphp/runtime/vm/jit/tracebuilder.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/tracebuilder.cpp rename to hphp/runtime/vm/jit/tracebuilder.cpp index 48bc66f5a..0184c4a3c 100644 --- a/hphp/runtime/vm/translator/hopt/tracebuilder.cpp +++ b/hphp/runtime/vm/jit/tracebuilder.cpp @@ -14,13 +14,13 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/hopt/tracebuilder.h" +#include "hphp/runtime/vm/jit/tracebuilder.h" #include "folly/ScopeGuard.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/irfactory.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/tracebuilder.h b/hphp/runtime/vm/jit/tracebuilder.h similarity index 98% rename from hphp/runtime/vm/translator/hopt/tracebuilder.h rename to hphp/runtime/vm/jit/tracebuilder.h index 2153000aa..4a4edfed7 100644 --- a/hphp/runtime/vm/translator/hopt/tracebuilder.h +++ b/hphp/runtime/vm/jit/tracebuilder.h @@ -22,11 +22,11 @@ #include "folly/ScopeGuard.h" #include "folly/Optional.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/irfactory.h" -#include "hphp/runtime/vm/translator/hopt/cse.h" -#include "hphp/runtime/vm/translator/hopt/simplifier.h" -#include "hphp/runtime/vm/translator/hopt/state_vector.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/irfactory.h" +#include "hphp/runtime/vm/jit/cse.h" +#include "hphp/runtime/vm/jit/simplifier.h" +#include "hphp/runtime/vm/jit/state_vector.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/trans-data.h b/hphp/runtime/vm/jit/trans-data.h similarity index 97% rename from hphp/runtime/vm/translator/trans-data.h rename to hphp/runtime/vm/jit/trans-data.h index 933fefe81..8db4e79b6 100644 --- a/hphp/runtime/vm/translator/trans-data.h +++ b/hphp/runtime/vm/jit/trans-data.h @@ -18,7 +18,7 @@ #define TRANS_DATA_H_ #include "hphp/util/base.h" -#include "hphp/runtime/vm/translator/types.h" +#include "hphp/runtime/vm/jit/types.h" #include diff --git a/hphp/runtime/vm/translator/translator-asm-helpers.S b/hphp/runtime/vm/jit/translator-asm-helpers.S similarity index 100% rename from hphp/runtime/vm/translator/translator-asm-helpers.S rename to hphp/runtime/vm/jit/translator-asm-helpers.S diff --git a/hphp/runtime/vm/translator/translator-inline.h b/hphp/runtime/vm/jit/translator-inline.h similarity index 99% rename from hphp/runtime/vm/translator/translator-inline.h rename to hphp/runtime/vm/jit/translator-inline.h index f025145f0..bd427092f 100644 --- a/hphp/runtime/vm/translator/translator-inline.h +++ b/hphp/runtime/vm/jit/translator-inline.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_TRANSLATOR_INLINE_H_ #define incl_HPHP_TRANSLATOR_INLINE_H_ -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include #include "hphp/runtime/base/execution_context.h" diff --git a/hphp/runtime/vm/translator/translator-runtime.cpp b/hphp/runtime/vm/jit/translator-runtime.cpp similarity index 99% rename from hphp/runtime/vm/translator/translator-runtime.cpp rename to hphp/runtime/vm/jit/translator-runtime.cpp index d35fca2a4..b35714fc7 100644 --- a/hphp/runtime/vm/translator/translator-runtime.cpp +++ b/hphp/runtime/vm/jit/translator-runtime.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/translator-runtime.h" +#include "hphp/runtime/vm/jit/translator-runtime.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/vm/member_operations.h" diff --git a/hphp/runtime/vm/translator/translator-runtime.h b/hphp/runtime/vm/jit/translator-runtime.h similarity index 97% rename from hphp/runtime/vm/translator/translator-runtime.h rename to hphp/runtime/vm/jit/translator-runtime.h index 24d30b064..802aed31f 100644 --- a/hphp/runtime/vm/translator/translator-runtime.h +++ b/hphp/runtime/vm/jit/translator-runtime.h @@ -17,8 +17,8 @@ #define incl_HPHP_TRANSLATOR_RUNTIME_H_ #include "hphp/runtime/base/types.h" -#include "hphp/runtime/vm/translator/abi-x64.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/abi-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/translator-x64-helpers.cpp b/hphp/runtime/vm/jit/translator-x64-helpers.cpp similarity index 98% rename from hphp/runtime/vm/translator/translator-x64-helpers.cpp rename to hphp/runtime/vm/jit/translator-x64-helpers.cpp index 46dbf3de7..5481c8df5 100644 --- a/hphp/runtime/vm/translator/translator-x64-helpers.cpp +++ b/hphp/runtime/vm/jit/translator-x64-helpers.cpp @@ -13,9 +13,9 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" -#include "hphp/runtime/vm/translator/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" #include "hphp/runtime/eval/runtime/file_repository.h" #include "hphp/runtime/vm/event_hook.h" #include "hphp/runtime/base/stats.h" diff --git a/hphp/runtime/vm/translator/translator-x64-internal.h b/hphp/runtime/vm/jit/translator-x64-internal.h similarity index 99% rename from hphp/runtime/vm/translator/translator-x64-internal.h rename to hphp/runtime/vm/jit/translator-x64-internal.h index a6acb7ce8..599b88bf4 100644 --- a/hphp/runtime/vm/translator/translator-x64-internal.h +++ b/hphp/runtime/vm/jit/translator-x64-internal.h @@ -20,7 +20,7 @@ #include #include -#include "hphp/runtime/vm/translator/abi-x64.h" +#include "hphp/runtime/vm/jit/abi-x64.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/translator-x64.cpp b/hphp/runtime/vm/jit/translator-x64.cpp similarity index 99% rename from hphp/runtime/vm/translator/translator-x64.cpp rename to hphp/runtime/vm/jit/translator-x64.cpp index 3648c7245..8419bfdeb 100644 --- a/hphp/runtime/vm/translator/translator-x64.cpp +++ b/hphp/runtime/vm/jit/translator-x64.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include #include @@ -74,22 +74,22 @@ typedef __sighandler_t *sighandler_t; #include "hphp/runtime/ext/ext_continuation.h" #include "hphp/runtime/ext/ext_function.h" #include "hphp/runtime/vm/debug/debug.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/srcdb.h" -#include "hphp/runtime/vm/translator/x64-util.h" -#include "hphp/runtime/vm/translator/unwind-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/srcdb.h" +#include "hphp/runtime/vm/jit/x64-util.h" +#include "hphp/runtime/vm/jit/unwind-x64.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/pendq.h" #include "hphp/runtime/vm/treadmill.h" #include "hphp/runtime/vm/repo.h" #include "hphp/runtime/vm/type_profile.h" #include "hphp/runtime/vm/member_operations.h" -#include "hphp/runtime/vm/translator/abi-x64.h" +#include "hphp/runtime/vm/jit/abi-x64.h" #include "hphp/runtime/eval/runtime/file_repository.h" -#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h" +#include "hphp/runtime/vm/jit/hhbctranslator.h" -#include "hphp/runtime/vm/translator/translator-x64-internal.h" +#include "hphp/runtime/vm/jit/translator-x64-internal.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/translator-x64.h b/hphp/runtime/vm/jit/translator-x64.h similarity index 99% rename from hphp/runtime/vm/translator/translator-x64.h rename to hphp/runtime/vm/jit/translator-x64.h index 7ef5627f2..e43a2ccae 100644 --- a/hphp/runtime/vm/translator/translator-x64.h +++ b/hphp/runtime/vm/jit/translator-x64.h @@ -21,14 +21,14 @@ #include #include "hphp/runtime/vm/bytecode.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/util/asm-x64.h" -#include "hphp/runtime/vm/translator/srcdb.h" -#include "hphp/runtime/vm/translator/unwind-x64.h" +#include "hphp/runtime/vm/jit/srcdb.h" +#include "hphp/runtime/vm/jit/unwind-x64.h" #include "tbb/concurrent_hash_map.h" #include "hphp/util/ringbuffer.h" #include "hphp/runtime/vm/debug/debug.h" -#include "hphp/runtime/vm/translator/abi-x64.h" +#include "hphp/runtime/vm/jit/abi-x64.h" namespace HPHP { class ExecutionContext; } diff --git a/hphp/runtime/vm/translator/translator.cpp b/hphp/runtime/vm/jit/translator.cpp similarity index 99% rename from hphp/runtime/vm/translator/translator.cpp rename to hphp/runtime/vm/jit/translator.cpp index ee0869dfc..bd7b75a25 100644 --- a/hphp/runtime/vm/translator/translator.cpp +++ b/hphp/runtime/vm/jit/translator.cpp @@ -13,7 +13,7 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" // Translator front-end: parse instruction stream into basic blocks, decode // and normalize instructions. Propagate run-time type info to instructions @@ -36,11 +36,11 @@ #include "hphp/runtime/ext/ext_continuation.h" #include "hphp/runtime/vm/hhbc.h" #include "hphp/runtime/vm/bytecode.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" -#include "hphp/runtime/vm/translator/annotation.h" -#include "hphp/runtime/vm/translator/hopt/type.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" +#include "hphp/runtime/vm/jit/annotation.h" +#include "hphp/runtime/vm/jit/type.h" #include "hphp/runtime/vm/type_profile.h" #include "hphp/runtime/vm/runtime.h" diff --git a/hphp/runtime/vm/translator/translator.h b/hphp/runtime/vm/jit/translator.h similarity index 99% rename from hphp/runtime/vm/translator/translator.h rename to hphp/runtime/vm/jit/translator.h index 0efb7ba3a..96181eeda 100644 --- a/hphp/runtime/vm/translator/translator.h +++ b/hphp/runtime/vm/jit/translator.h @@ -32,11 +32,11 @@ #include "hphp/util/timer.h" #include "hphp/runtime/base/execution_context.h" #include "hphp/runtime/vm/bytecode.h" -#include "hphp/runtime/vm/translator/immstack.h" -#include "hphp/runtime/vm/translator/runtime-type.h" -#include "hphp/runtime/vm/translator/fixup.h" -#include "hphp/runtime/vm/translator/writelease.h" -#include "hphp/runtime/vm/translator/trans-data.h" +#include "hphp/runtime/vm/jit/immstack.h" +#include "hphp/runtime/vm/jit/runtime-type.h" +#include "hphp/runtime/vm/jit/fixup.h" +#include "hphp/runtime/vm/jit/writelease.h" +#include "hphp/runtime/vm/jit/trans-data.h" #include "hphp/runtime/vm/debugger_hook.h" #include "hphp/runtime/base/md5.h" diff --git a/hphp/runtime/vm/translator/hopt/type.cpp b/hphp/runtime/vm/jit/type.cpp similarity index 97% rename from hphp/runtime/vm/translator/hopt/type.cpp rename to hphp/runtime/vm/jit/type.cpp index f4e7a6c13..aad25b71f 100644 --- a/hphp/runtime/vm/translator/hopt/type.cpp +++ b/hphp/runtime/vm/jit/type.cpp @@ -19,10 +19,10 @@ #include "folly/experimental/Gen.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/irinstruction.h" -#include "hphp/runtime/vm/translator/hopt/ssatmp.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/irinstruction.h" +#include "hphp/runtime/vm/jit/ssatmp.h" +#include "hphp/runtime/vm/jit/translator.h" using namespace HPHP::Transl; diff --git a/hphp/runtime/vm/translator/hopt/type.h b/hphp/runtime/vm/jit/type.h similarity index 99% rename from hphp/runtime/vm/translator/hopt/type.h rename to hphp/runtime/vm/jit/type.h index 6e64aee06..f72f0c703 100644 --- a/hphp/runtime/vm/translator/hopt/type.h +++ b/hphp/runtime/vm/jit/type.h @@ -17,7 +17,7 @@ #ifndef incl_HPHP_JIT_TYPE_H_ #define incl_HPHP_JIT_TYPE_H_ -#include "hphp/runtime/vm/translator/runtime-type.h" +#include "hphp/runtime/vm/jit/runtime-type.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/types.h b/hphp/runtime/vm/jit/types.h similarity index 100% rename from hphp/runtime/vm/translator/types.h rename to hphp/runtime/vm/jit/types.h diff --git a/hphp/runtime/vm/translator/unwind-x64.cpp b/hphp/runtime/vm/jit/unwind-x64.cpp similarity index 97% rename from hphp/runtime/vm/translator/unwind-x64.cpp rename to hphp/runtime/vm/jit/unwind-x64.cpp index 9f422ea71..0f54e2cd5 100644 --- a/hphp/runtime/vm/translator/unwind-x64.cpp +++ b/hphp/runtime/vm/jit/unwind-x64.cpp @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/unwind-x64.h" +#include "hphp/runtime/vm/jit/unwind-x64.h" #include #include @@ -22,10 +22,10 @@ #include #include -#include "hphp/runtime/vm/translator/abi-x64.h" -#include "hphp/runtime/vm/translator/runtime-type.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/abi-x64.h" +#include "hphp/runtime/vm/jit/runtime-type.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/stats.h" #include "hphp/runtime/vm/runtime.h" #include "hphp/runtime/vm/member_operations.h" diff --git a/hphp/runtime/vm/translator/unwind-x64.h b/hphp/runtime/vm/jit/unwind-x64.h similarity index 94% rename from hphp/runtime/vm/translator/unwind-x64.h rename to hphp/runtime/vm/jit/unwind-x64.h index a955f1af6..0bfc62f10 100644 --- a/hphp/runtime/vm/translator/unwind-x64.h +++ b/hphp/runtime/vm/jit/unwind-x64.h @@ -25,11 +25,11 @@ #include "hphp/util/assertions.h" #include "hphp/runtime/base/types.h" -#include "hphp/runtime/vm/translator/types.h" +#include "hphp/runtime/vm/jit/types.h" #include "hphp/runtime/vm/tread_hash_map.h" -#include "hphp/runtime/vm/translator/types.h" +#include "hphp/runtime/vm/jit/types.h" #include "hphp/util/asm-x64.h" -#include "hphp/runtime/vm/translator/runtime-type.h" +#include "hphp/runtime/vm/jit/runtime-type.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h b/hphp/runtime/vm/jit/vectortranslator-internal.h similarity index 99% rename from hphp/runtime/vm/translator/hopt/vectortranslator-internal.h rename to hphp/runtime/vm/jit/vectortranslator-internal.h index 1fb224805..586241555 100644 --- a/hphp/runtime/vm/translator/hopt/vectortranslator-internal.h +++ b/hphp/runtime/vm/jit/vectortranslator-internal.h @@ -20,7 +20,7 @@ #include "hphp/util/base.h" #include "hphp/runtime/base/types.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/runtime/vm/member_operations.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp b/hphp/runtime/vm/jit/vectortranslator.cpp similarity index 99% rename from hphp/runtime/vm/translator/hopt/vectortranslator.cpp rename to hphp/runtime/vm/jit/vectortranslator.cpp index 3c74b2a4f..cd7a28c95 100644 --- a/hphp/runtime/vm/translator/hopt/vectortranslator.cpp +++ b/hphp/runtime/vm/jit/vectortranslator.cpp @@ -16,14 +16,14 @@ #include "hphp/runtime/base/strings.h" #include "hphp/runtime/vm/member_operations.h" -#include "hphp/runtime/vm/translator/hopt/hhbctranslator.h" -#include "hphp/runtime/vm/translator/hopt/ir.h" -#include "hphp/runtime/vm/translator/hopt/irinstruction.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/hhbctranslator.h" +#include "hphp/runtime/vm/jit/ir.h" +#include "hphp/runtime/vm/jit/irinstruction.h" +#include "hphp/runtime/vm/jit/translator-x64.h" // These files do ugly things with macros so include them last #include "hphp/util/assert_throw.h" -#include "hphp/runtime/vm/translator/hopt/vectortranslator-internal.h" +#include "hphp/runtime/vm/jit/vectortranslator-internal.h" namespace HPHP { namespace JIT { diff --git a/hphp/runtime/vm/translator/writelease.cpp b/hphp/runtime/vm/jit/writelease.cpp similarity index 97% rename from hphp/runtime/vm/translator/writelease.cpp rename to hphp/runtime/vm/jit/writelease.cpp index aa75d09ab..6edadd513 100644 --- a/hphp/runtime/vm/translator/writelease.cpp +++ b/hphp/runtime/vm/jit/writelease.cpp @@ -13,10 +13,10 @@ | license@php.net so we can mail you a copy immediately. | +----------------------------------------------------------------------+ */ -#include "hphp/runtime/vm/translator/writelease.h" +#include "hphp/runtime/vm/jit/writelease.h" #include "hphp/util/timer.h" #include "hphp/runtime/vm/bytecode.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include diff --git a/hphp/runtime/vm/translator/writelease.h b/hphp/runtime/vm/jit/writelease.h similarity index 100% rename from hphp/runtime/vm/translator/writelease.h rename to hphp/runtime/vm/jit/writelease.h diff --git a/hphp/runtime/vm/translator/x64-util.h b/hphp/runtime/vm/jit/x64-util.h similarity index 97% rename from hphp/runtime/vm/translator/x64-util.h rename to hphp/runtime/vm/jit/x64-util.h index f090783df..67313bd17 100644 --- a/hphp/runtime/vm/translator/x64-util.h +++ b/hphp/runtime/vm/jit/x64-util.h @@ -17,7 +17,7 @@ #define X64_UTIL_H_ #include "hphp/util/asm-x64.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { namespace Transl { diff --git a/hphp/runtime/vm/runtime.cpp b/hphp/runtime/vm/runtime.cpp index 3891fa53b..f77e43eb9 100644 --- a/hphp/runtime/vm/runtime.cpp +++ b/hphp/runtime/vm/runtime.cpp @@ -26,8 +26,8 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/repo.h" #include "hphp/util/trace.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/base/zend/zend_functions.h" #include "hphp/runtime/ext/ext_string.h" diff --git a/hphp/runtime/vm/runtime.h b/hphp/runtime/vm/runtime.h index bdd749d8b..f11ede958 100644 --- a/hphp/runtime/vm/runtime.h +++ b/hphp/runtime/vm/runtime.h @@ -20,7 +20,7 @@ #include "hphp/runtime/vm/func.h" #include "hphp/runtime/vm/funcdict.h" #include "hphp/runtime/base/builtin_functions.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" namespace HPHP { diff --git a/hphp/runtime/vm/treadmill.cpp b/hphp/runtime/vm/treadmill.cpp index bc6337628..2e11d90ec 100644 --- a/hphp/runtime/vm/treadmill.cpp +++ b/hphp/runtime/vm/treadmill.cpp @@ -26,7 +26,7 @@ #include "hphp/runtime/base/macros.h" #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/treadmill.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/translator-x64.h" namespace HPHP { namespace Treadmill { diff --git a/hphp/runtime/vm/type_constraint.cpp b/hphp/runtime/vm/type_constraint.cpp index 1906d888c..552c17a27 100644 --- a/hphp/runtime/vm/type_constraint.cpp +++ b/hphp/runtime/vm/type_constraint.cpp @@ -23,7 +23,7 @@ #include "hphp/runtime/vm/class.h" #include "hphp/runtime/vm/unit.h" #include "hphp/runtime/vm/func.h" -#include "hphp/runtime/vm/translator/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-inline.h" #include "hphp/runtime/base/builtin_functions.h" namespace HPHP { diff --git a/hphp/runtime/vm/type_profile.cpp b/hphp/runtime/vm/type_profile.cpp index 3da901b53..c13182bb9 100644 --- a/hphp/runtime/vm/type_profile.cpp +++ b/hphp/runtime/vm/type_profile.cpp @@ -16,7 +16,7 @@ #include "hphp/runtime/vm/type_profile.h" #include "hphp/runtime/base/runtime_option.h" #include "hphp/runtime/base/stats.h" -#include "hphp/runtime/vm/translator/translator.h" +#include "hphp/runtime/vm/jit/translator.h" #include "hphp/util/trace.h" #include diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp index eac17b8ee..92c0ea3f5 100644 --- a/hphp/runtime/vm/unit.cpp +++ b/hphp/runtime/vm/unit.cpp @@ -32,9 +32,9 @@ #include "hphp/runtime/vm/bytecode.h" #include "hphp/runtime/vm/repo.h" #include "hphp/runtime/vm/blob_helper.h" -#include "hphp/runtime/vm/translator/targetcache.h" -#include "hphp/runtime/vm/translator/translator-inline.h" -#include "hphp/runtime/vm/translator/translator-x64.h" +#include "hphp/runtime/vm/jit/targetcache.h" +#include "hphp/runtime/vm/jit/translator-inline.h" +#include "hphp/runtime/vm/jit/translator-x64.h" #include "hphp/runtime/vm/verifier/check.h" #include "hphp/runtime/base/strings.h" #include "hphp/runtime/vm/func_inline.h"