← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libv8/trusty

« back to all changes in this revision

Viewing changes to src/mips/assembler-mips.cc

  • Committer: Package Import Robot
  • Author(s): Jérémy Lal
  • Date: 2012-02-20 14:08:17 UTC
  • mfrom: (15.1.24 sid)
  • Revision ID: package-import@ubuntu.com-20120220140817-bsvmeoa4sxsj5hbz
Tags: 3.7.12.22-3
Fix mipsel build, allow test debug-step-3 to fail (non-crucial)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mips/assembler-mips.cc
74
74
 
75
75
 
76
76
void CpuFeatures::Probe() {
77
 
  ASSERT(!initialized_);
 
77
  unsigned standard_features = (OS::CpuFeaturesImpliedByPlatform() |
 
78
                                CpuFeaturesImpliedByCompiler());
 
79
  ASSERT(supported_ == 0 || supported_ == standard_features);
78
80
#ifdef DEBUG
79
81
  initialized_ = true;
80
82
#endif
82
84
  // Get the features implied by the OS and the compiler settings. This is the
83
85
  // minimal set of features which is also allowed for generated code in the
84
86
  // snapshot.
85
 
  supported_ |= OS::CpuFeaturesImpliedByPlatform();
86
 
  supported_ |= CpuFeaturesImpliedByCompiler();
 
87
  supported_ |= standard_features;
87
88
 
88
89
  if (Serializer::enabled()) {
89
90
    // No probing for features if we might serialize (generate snapshot).
2018
2019
 
2019
2020
 
2020
2021
void Assembler::RecordRelocInfo(RelocInfo::Mode rmode, intptr_t data) {
2021
 
  RelocInfo rinfo(pc_, rmode, data);  // We do not try to reuse pool constants.
 
2022
  // We do not try to reuse pool constants.
 
2023
  RelocInfo rinfo(pc_, rmode, data, NULL);
2022
2024
  if (rmode >= RelocInfo::JS_RETURN && rmode <= RelocInfo::DEBUG_BREAK_SLOT) {
2023
2025
    // Adjust code for new modes.
2024
2026
    ASSERT(RelocInfo::IsDebugBreakSlot(rmode)
2041
2043
    }
2042
2044
    ASSERT(buffer_space() >= kMaxRelocSize);  // Too late to grow buffer here.
2043
2045
    if (rmode == RelocInfo::CODE_TARGET_WITH_ID) {
2044
 
      RelocInfo reloc_info_with_ast_id(pc_, rmode, RecordedAstId());
 
2046
      RelocInfo reloc_info_with_ast_id(pc_, rmode, RecordedAstId(), NULL);
2045
2047
      ClearRecordedAstId();
2046
2048
      reloc_info_writer.Write(&reloc_info_with_ast_id);
2047
2049
    } else {