Experimental parser: merge r19949

src/a64/lithium-codegen-a64.h

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 208 matching lines @@
                                    LOperand* index,
                                    String::Encoding encoding);
   void DeoptimizeBranch(
       LEnvironment* environment,
       BranchType branch_type, Register reg = NoReg, int bit = -1,
       Deoptimizer::BailoutType* override_bailout_type = NULL);
   void Deoptimize(LEnvironment* environment,
                   Deoptimizer::BailoutType* override_bailout_type = NULL);
   void DeoptimizeIf(Condition cc, LEnvironment* environment);
   void DeoptimizeIfZero(Register rt, LEnvironment* environment);
+  void DeoptimizeIfNotZero(Register rt, LEnvironment* environment);
   void DeoptimizeIfNegative(Register rt, LEnvironment* environment);
   void DeoptimizeIfSmi(Register rt, LEnvironment* environment);
   void DeoptimizeIfNotSmi(Register rt, LEnvironment* environment);
   void DeoptimizeIfRoot(Register rt,
                         Heap::RootListIndex index,
                         LEnvironment* environment);
   void DeoptimizeIfNotRoot(Register rt,
                            Heap::RootListIndex index,
                            LEnvironment* environment);
   void ApplyCheckIf(Condition cc, LBoundsCheck* check);
@@ skipping 29 matching lines @@
                         LOperand* op,
                         bool is_tagged,
                         bool is_uint32,
                         int* object_index_pointer,
                         int* dematerialized_index_pointer);
 
   void SaveCallerDoubles();
   void RestoreCallerDoubles();
 
   // Code generation steps.  Returns true if code generation should continue.
+  void GenerateBodyInstructionPre(LInstruction* instr) V8_OVERRIDE;
   bool GeneratePrologue();
   bool GenerateDeferredCode();
   bool GenerateDeoptJumpTable();
   bool GenerateSafepointTable();
 
   // Generates the custom OSR entrypoint and sets the osr_pc_offset.
   void GenerateOsrPrologue();
 
   enum SafepointMode {
     RECORD_SIMPLE_SAFEPOINT,
@@ skipping 50 matching lines @@
                                     Safepoint::DeoptMode mode);
   void RecordSafepointWithRegistersAndDoubles(LPointerMap* pointers,
                                               int arguments,
                                               Safepoint::DeoptMode mode);
   void RecordSafepointWithLazyDeopt(LInstruction* instr,
                                     SafepointMode safepoint_mode);
 
   void EnsureSpaceForLazyDeopt(int space_needed) V8_OVERRIDE;
 
   ZoneList<LEnvironment*> deoptimizations_;
-  ZoneList<Deoptimizer::JumpTableEntry> deopt_jump_table_;
+  ZoneList<Deoptimizer::JumpTableEntry*> deopt_jump_table_;
   ZoneList<Handle<Object> > deoptimization_literals_;
   int inlined_function_count_;
   Scope* const scope_;
   TranslationBuffer translations_;
   ZoneList<LDeferredCode*> deferred_;
   int osr_pc_offset_;
   bool frame_is_built_;
 
   // Builder that keeps track of safepoints in the code. The table itself is
   // emitted at the end of the generated code.
@@ skipping 105 matching lines @@
 
  protected:
   MacroAssembler* masm() const { return codegen_->masm(); }
 
   LCodeGen* codegen_;
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_A64_LITHIUM_CODEGEN_A64_H_