Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up dyn_regs.h usage #235

Merged
merged 3 commits into from
Oct 27, 2023
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use arch-specific register files
hainest committed Oct 26, 2023
commit 480108828e7390e2589fb3f3421325656e37ba0e
2 changes: 1 addition & 1 deletion src/instruction/aarch64_cft.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/aarch64/aarch64_regs.h"

#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
2 changes: 1 addition & 1 deletion src/instruction/aarch64_decode.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/aarch64/aarch64_regs.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <deque>
2 changes: 1 addition & 1 deletion src/instruction/aarch64_decode_ldst.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/aarch64/aarch64_regs.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <deque>
2 changes: 1 addition & 1 deletion src/instruction/aarch64_simd.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/aarch64/aarch64_regs.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <deque>
3 changes: 2 additions & 1 deletion src/instruction/fucompp.C
Original file line number Diff line number Diff line change
@@ -35,7 +35,8 @@
#include "InstructionDecoder.h"
#include <boost/assign/list_of.hpp>
#include <deque>
#include "dyn_regs.h"
#include "Architecture.h"
#include "registers/x86_regs.h"

using namespace Dyninst;
using namespace InstructionAPI;
2 changes: 1 addition & 1 deletion src/instruction/power_cft.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/ppc32_regs.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <deque>
2 changes: 1 addition & 1 deletion src/instruction/power_decode.C
Original file line number Diff line number Diff line change
@@ -34,7 +34,7 @@
#include "Instruction.h"
#include "InstructionDecoder.h"
#include "Register.h"
#include "dyn_regs.h"
#include "registers/ppc32_regs.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>
#include <deque>
12 changes: 11 additions & 1 deletion src/instruction/test_instruction_bind_eval.C
Original file line number Diff line number Diff line change
@@ -35,10 +35,20 @@
#include "InstructionDecoder.h"
#include "Expression.h"
#include "Result.h"
#include "dyn_regs.h"
#include "Architecture.h"
#include <boost/assign/list_of.hpp>
#include <boost/iterator/indirect_iterator.hpp>

#if defined(arch_x86_64_test)
# include "registers/x86_64_regs.h"
Dyninst::Architecture curArch = Dyninst::Arch_x86_64;
using namespace Dyninst::x86_64;
#elif defined(arch_x86_test)
# include "registers/x86_regs.h"
Dyninst::Architecture curArch = Dyninst::Arch_x86;
using namespace Dyninst::x86;
#endif

using namespace Dyninst;
using namespace InstructionAPI;
using namespace boost::assign;
4 changes: 3 additions & 1 deletion src/instruction/test_instruction_read_write.C
Original file line number Diff line number Diff line change
@@ -35,7 +35,9 @@
#include "InstructionDecoder.h"
#include <boost/assign/list_of.hpp>
#include <deque>
#include "dyn_regs.h"
#include "Architecture.h"
#include "registers/x86_regs.h"
#include "registers/x86_64_regs.h"

using namespace Dyninst;
using namespace InstructionAPI;