Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(664)

Side by Side Diff: src/x64/assembler-x64.cc

Issue 3058049: Do not apply JS_RETURN and DEBUG_BREAK_SLOT relocations on x64. (Closed)
Patch Set: removed break slot/return from ::apply Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2009 the V8 project authors. All rights reserved. 1 // Copyright 2009 the V8 project authors. All rights reserved.
2 // Redistribution and use in source and binary forms, with or without 2 // Redistribution and use in source and binary forms, with or without
3 // modification, are permitted provided that the following conditions are 3 // modification, are permitted provided that the following conditions are
4 // met: 4 // met:
5 // 5 //
6 // * Redistributions of source code must retain the above copyright 6 // * Redistributions of source code must retain the above copyright
7 // notice, this list of conditions and the following disclaimer. 7 // notice, this list of conditions and the following disclaimer.
8 // * Redistributions in binary form must reproduce the above 8 // * Redistributions in binary form must reproduce the above
9 // copyright notice, this list of conditions and the following 9 // copyright notice, this list of conditions and the following
10 // disclaimer in the documentation and/or other materials provided 10 // disclaimer in the documentation and/or other materials provided
(...skipping 2923 matching lines...) Expand 10 before | Expand all | Expand 10 after
2934 written_position_ = current_position_; 2934 written_position_ = current_position_;
2935 written = true; 2935 written = true;
2936 } 2936 }
2937 2937
2938 // Return whether something was written. 2938 // Return whether something was written.
2939 return written; 2939 return written;
2940 } 2940 }
2941 2941
2942 2942
2943 const int RelocInfo::kApplyMask = RelocInfo::kCodeTargetMask | 2943 const int RelocInfo::kApplyMask = RelocInfo::kCodeTargetMask |
2944 1 << RelocInfo::INTERNAL_REFERENCE | 2944 1 << RelocInfo::INTERNAL_REFERENCE;
2945 1 << RelocInfo::JS_RETURN |
2946 1 << RelocInfo::DEBUG_BREAK_SLOT;
2947 2945
2948 2946
2949 bool RelocInfo::IsCodedSpecially() { 2947 bool RelocInfo::IsCodedSpecially() {
2950 // The deserializer needs to know whether a pointer is specially coded. Being 2948 // The deserializer needs to know whether a pointer is specially coded. Being
2951 // specially coded on x64 means that it is a relative 32 bit address, as used 2949 // specially coded on x64 means that it is a relative 32 bit address, as used
2952 // by branch instructions. 2950 // by branch instructions.
2953 return (1 << rmode_) & kApplyMask; 2951 return (1 << rmode_) & kApplyMask;
2954 } 2952 }
2955 2953
2956 2954
2957 2955
2958 } } // namespace v8::internal 2956 } } // namespace v8::internal
2959 2957
2960 #endif // V8_TARGET_ARCH_X64 2958 #endif // V8_TARGET_ARCH_X64
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698