Merge "LockAgent: Refactor transformation code" am: e07c0cffe2 am: 14d72a73d9 am: 1e1d89d66c (329c78f6) · Commits · e / os / android_frameworks_base

tools/lock_agent/agent.cpp

+116 −88

Original line number	Diff line number	Diff line
		@@ -85,12 +85,16 @@ std::string classNameToDescriptor(const char* className) {
		using namespace dex;
		using namespace lir;

		bool transform(std::shared_ptr<ir::DexFile> dexIr) {
		bool modified = false;
		class Transformer {
		public:
		explicit Transformer(std::shared_ptr<ir::DexFile> dexIr) : dexIr_(dexIr) {}

		bool transform() {
		bool classModified = false;

		std::unique_ptr<ir::Builder> builder;

		for (auto& method : dexIr->encoded_methods) {
		for (auto& method : dexIr_->encoded_methods) {
		// Do not look into abstract/bridge/native/synthetic methods.
		if ((method->access_flags & (kAccAbstract \| kAccBridge \| kAccNative \| kAccSynthetic))
		!= 0) {
		@@ -98,41 +102,80 @@ bool transform(std::shared_ptr<ir::DexFile> dexIr) {
		}

		struct HookVisitor: public Visitor {
		HookVisitor(std::unique_ptr<ir::Builder>* b, std::shared_ptr<ir::DexFile> d_ir,
		CodeIr* c_ir) :
		b(b), dIr(d_ir), cIr(c_ir) {
		HookVisitor(Transformer* transformer, CodeIr* c_ir)
		: transformer(transformer), cIr(c_ir) {
		}

		bool Visit(Bytecode* bytecode) override {
		if (bytecode->opcode == OP_MONITOR_ENTER) {
		prepare();
		addCall(bytecode, OP_INVOKE_STATIC_RANGE, hookType, "preLock", voidType,
		objectType, reinterpret_cast<VReg*>(bytecode->operands[0])->reg);
		myModified = true;
		insertHook(bytecode, true,
		reinterpret_cast<VReg*>(bytecode->operands[0])->reg);
		return true;
		}
		if (bytecode->opcode == OP_MONITOR_EXIT) {
		prepare();
		addCall(bytecode, OP_INVOKE_STATIC_RANGE, hookType, "postLock", voidType,
		objectType, reinterpret_cast<VReg*>(bytecode->operands[0])->reg);
		myModified = true;
		insertHook(bytecode, false,
		reinterpret_cast<VReg*>(bytecode->operands[0])->reg);
		return true;
		}
		return false;
		}

		void prepare() {
		if (*b == nullptr) {
		*b = std::unique_ptr<ir::Builder>(new ir::Builder(dIr));
		void insertHook(lir::Instruction* before, bool pre, u4 reg) {
		transformer->preparePrePost();
		transformer->addCall(cIr, before, OP_INVOKE_STATIC_RANGE,
		transformer->hookType_, pre ? "preLock" : "postLock",
		transformer->voidType_, transformer->objectType_, reg);
		myModified = true;
		}

		Transformer* transformer;
		CodeIr* cIr;
		bool myModified = false;
		};

		CodeIr c(method.get(), dexIr_);
		bool methodModified = false;

		HookVisitor visitor(this, &c);
		for (auto it = c.instructions.begin(); it != c.instructions.end(); ++it) {
		lir::Instruction* fi = *it;
		fi->Accept(&visitor);
		}
		methodModified \|= visitor.myModified;

		if (methodModified) {
		classModified = true;
		c.Assemble();
		}
		if (voidType == nullptr) {
		voidType = (*b)->GetType("V");
		hookType = (*b)->GetType("Lcom/android/lock_checker/LockHook;");
		objectType = (*b)->GetType("Ljava/lang/Object;");
		}

		return classModified;
		}

		void addInst(lir::Instruction* instructionAfter, Opcode opcode,
		private:
		void preparePrePost() {
		// Insert "void LockHook.(pre\|post)(Object o)."

		prepareBuilder();

		if (voidType_ == nullptr) {
		voidType_ = builder_->GetType("V");
		}
		if (hookType_ == nullptr) {
		hookType_ = builder_->GetType("Lcom/android/lock_checker/LockHook;");
		}
		if (objectType_ == nullptr) {
		objectType_ = builder_->GetType("Ljava/lang/Object;");
		}
		}

		void prepareBuilder() {
		if (builder_ == nullptr) {
		builder_ = std::unique_ptr<ir::Builder>(new ir::Builder(dexIr_));
		}
		}

		static void addInst(CodeIr* cIr, lir::Instruction* instructionAfter, Opcode opcode,
		const std::list<Operand*>& operands) {
		auto instruction = cIr->Alloc<Bytecode>();

		@@ -145,58 +188,40 @@ bool transform(std::shared_ptr<ir::DexFile> dexIr) {
		cIr->instructions.InsertBefore(instructionAfter, instruction);
		}

		void addCall(lir::Instruction* instructionAfter, Opcode opcode, ir::Type* type,
		void addCall(CodeIr* cIr, lir::Instruction* instructionAfter, Opcode opcode, ir::Type* type,
		const char* methodName, ir::Type* returnType,
		const std::vector<ir::Type*>& types, const std::list<int>& regs) {
		auto proto = (b)->GetProto(returnType, (b)->GetTypeList(types));
		auto method = (b)->GetMethodDecl((b)->GetAsciiString(methodName), proto, type);
		auto proto = builder_->GetProto(returnType, builder_->GetTypeList(types));
		auto method = builder_->GetMethodDecl(builder_->GetAsciiString(methodName), proto, type);

		VRegList* paramRegs = cIr->Alloc<VRegList>();
		for (auto it = regs.begin(); it != regs.end(); it++) {
		paramRegs->registers.push_back(*it);
		}

		addInst(instructionAfter, opcode,
		addInst(cIr, instructionAfter, opcode,
		{ paramRegs, cIr->Alloc<Method>(method, method->orig_index) });
		}

		void addCall(lir::Instruction* instructionAfter, Opcode opcode, ir::Type* type,
		void addCall(CodeIr* cIr, lir::Instruction* instructionAfter, Opcode opcode, ir::Type* type,
		const char* methodName, ir::Type* returnType, ir::Type* paramType,
		u4 paramVReg) {
		auto proto = (b)->GetProto(returnType, (b)->GetTypeList( { paramType }));
		auto method = (b)->GetMethodDecl((b)->GetAsciiString(methodName), proto, type);
		auto proto = builder_->GetProto(returnType, builder_->GetTypeList( { paramType }));
		auto method = builder_->GetMethodDecl(builder_->GetAsciiString(methodName), proto, type);

		VRegRange* args = cIr->Alloc<VRegRange>(paramVReg, 1);

		addInst(instructionAfter, opcode,
		addInst(cIr, instructionAfter, opcode,
		{ args, cIr->Alloc<Method>(method, method->orig_index) });
		}

		std::unique_ptr<ir::Builder>* b;
		std::shared_ptr<ir::DexFile> dIr;
		CodeIr* cIr;
		ir::Type* voidType = nullptr;
		ir::Type* hookType = nullptr;
		ir::Type* objectType = nullptr;
		bool myModified = false;
		};
		std::shared_ptr<ir::DexFile> dexIr_;
		std::unique_ptr<ir::Builder> builder_;

		CodeIr c(method.get(), dexIr);
		HookVisitor visitor(&builder, dexIr, &c);

		for (auto it = c.instructions.begin(); it != c.instructions.end(); ++it) {
		lir::Instruction* fi = *it;
		fi->Accept(&visitor);
		}

		if (visitor.myModified) {
		modified = true;
		c.Assemble();
		}
		}

		return modified;
		}
		ir::Type* voidType_ = nullptr;
		ir::Type* hookType_ = nullptr;
		ir::Type* objectType_ = nullptr;
		};

		std::pair<dex::u1, size_t> maybeTransform(const char name, size_t classDataLen,
		const unsigned char* classData, dex::Writer::Allocator* allocator) {
		@@ -209,9 +234,12 @@ std::pair<dex::u1, size_t> maybeTransform(const char name, size_t classDataLen
		reader.CreateClassIr(index);
		std::shared_ptr<ir::DexFile> ir = reader.GetIr();

		if (!transform(ir)) {
		{
		Transformer transformer(ir);
		if (!transformer.transform()) {
		return std::make_pair(nullptr, 0);
		}
		}

		size_t new_size;
		dex::Writer writer(ir);