diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-11 17:53:17 +0000 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-13 09:23:12 +0000 |
commit | bab4ed7057799a4fadc6283108ab56f389d117d4 (patch) | |
tree | ea1bf495458fd9f7a3ffbed0ea4e1dda5a0b8184 /compiler/optimizing/code_generator.h | |
parent | 37d4c1db4d705f5a28001f65afdd68d0527948d8 (diff) | |
download | art-bab4ed7057799a4fadc6283108ab56f389d117d4.zip art-bab4ed7057799a4fadc6283108ab56f389d117d4.tar.gz art-bab4ed7057799a4fadc6283108ab56f389d117d4.tar.bz2 |
More code generation for the optimizing compiler.
- Add HReturn instruction
- Generate code for locals/if/return
- Setup infrastructure for register allocation. Currently
emulate a stack.
Change-Id: Ib28c2dba80f6c526177ed9a7b09c0689ac8122fb
Diffstat (limited to 'compiler/optimizing/code_generator.h')
-rw-r--r-- | compiler/optimizing/code_generator.h | 92 |
1 files changed, 87 insertions, 5 deletions
diff --git a/compiler/optimizing/code_generator.h b/compiler/optimizing/code_generator.h index 2a5ae7d..c406378 100644 --- a/compiler/optimizing/code_generator.h +++ b/compiler/optimizing/code_generator.h @@ -17,6 +17,7 @@ #ifndef ART_COMPILER_OPTIMIZING_CODE_GENERATOR_H_ #define ART_COMPILER_OPTIMIZING_CODE_GENERATOR_H_ +#include "globals.h" #include "instruction_set.h" #include "memory_region.h" #include "nodes.h" @@ -35,12 +36,82 @@ class CodeAllocator { DISALLOW_COPY_AND_ASSIGN(CodeAllocator); }; +/** + * A Location is an abstraction over the potential location + * of an instruction. It could be in register or stack. + */ +class Location : public ValueObject { + public: + template<typename T> + T reg() const { return static_cast<T>(reg_); } + + Location() : reg_(kInvalid) { } + explicit Location(uword reg) : reg_(reg) { } + + static Location RegisterLocation(uword reg) { + return Location(reg); + } + + bool IsValid() const { return reg_ != kInvalid; } + + Location(const Location& other) : reg_(other.reg_) { } + + Location& operator=(const Location& other) { + reg_ = other.reg_; + return *this; + } + + private: + // The target register for that location. + // TODO: Support stack location. + uword reg_; + static const uword kInvalid = -1; +}; + +/** + * The code generator computes LocationSummary for each instruction so that + * the instruction itself knows what code to generate: where to find the inputs + * and where to place the result. + * + * The intent is to have the code for generating the instruction independent of + * register allocation. A register allocator just has to provide a LocationSummary. + */ +class LocationSummary : public ArenaObject { + public: + explicit LocationSummary(HInstruction* instruction) + : inputs(instruction->block()->graph()->arena(), instruction->InputCount()) { + inputs.SetSize(instruction->InputCount()); + for (int i = 0; i < instruction->InputCount(); i++) { + inputs.Put(i, Location()); + } + } + + void SetInAt(uint32_t at, Location location) { + inputs.Put(at, location); + } + + Location InAt(uint32_t at) const { + return inputs.Get(at); + } + + void SetOut(Location location) { + output = Location(location); + } + + Location Out() const { return output; } + + private: + GrowableArray<Location> inputs; + Location output; + + DISALLOW_COPY_AND_ASSIGN(LocationSummary); +}; + class CodeGenerator : public HGraphVisitor { public: // Compiles the graph to executable instructions. Returns whether the compilation // succeeded. - static bool CompileGraph( - HGraph* graph, InstructionSet instruction_set, CodeAllocator* allocator); + static bool CompileGraph(HGraph* graph, InstructionSet instruction_set, CodeAllocator* allocator); Assembler* assembler() const { return assembler_; } @@ -54,20 +125,31 @@ class CodeGenerator : public HGraphVisitor { protected: CodeGenerator(Assembler* assembler, HGraph* graph) - : HGraphVisitor(graph), assembler_(assembler), block_labels_(graph->arena(), 0) { + : HGraphVisitor(graph), + frame_size_(0), + assembler_(assembler), + block_labels_(graph->arena(), 0) { block_labels_.SetSize(graph->blocks()->Size()); } Label* GetLabelOf(HBasicBlock* block) const; - bool GoesToNextBlock(HGoto* got) const; + bool GoesToNextBlock(HBasicBlock* current, HBasicBlock* next) const; + + // Frame size required for this method. + uint32_t frame_size_; - private: virtual void GenerateFrameEntry() = 0; virtual void GenerateFrameExit() = 0; virtual void Bind(Label* label) = 0; + virtual void Move(HInstruction* instruction, Location location) = 0; + virtual void Push(HInstruction* instruction, Location location) = 0; + virtual HGraphVisitor* GetLocationBuilder() = 0; + private: + void InitLocations(HInstruction* instruction); void Compile(CodeAllocator* allocator); void CompileBlock(HBasicBlock* block); + void CompileEntryBlock(); Assembler* const assembler_; |