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

Unified Diff: third_party/tcmalloc/chromium/src/windows/mini_disassembler.cc

Issue 9667026: Revert 126020 - Experiment for updating the tcmalloc chromium branch to r144 (gperftools 2.0). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 9 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 side-by-side diff with in-line comments
Download patch
Index: third_party/tcmalloc/chromium/src/windows/mini_disassembler.cc
===================================================================
--- third_party/tcmalloc/chromium/src/windows/mini_disassembler.cc (revision 126022)
+++ third_party/tcmalloc/chromium/src/windows/mini_disassembler.cc (working copy)
@@ -100,12 +100,6 @@
void MiniDisassembler::Initialize() {
operand_is_32_bits_ = operand_default_is_32_bits_;
address_is_32_bits_ = address_default_is_32_bits_;
-#ifdef _M_X64
- operand_default_support_64_bits_ = true;
-#else
- operand_default_support_64_bits_ = false;
-#endif
- operand_is_64_bits_ = false;
operand_bytes_ = 0;
have_modrm_ = false;
should_decode_modrm_ = false;
@@ -135,8 +129,6 @@
got_f3_prefix_ = true;
else if (0x66 == (*start_byte))
got_66_prefix_ = true;
- else if (operand_default_support_64_bits_ && (*start_byte) & 0x48)
- operand_is_64_bits_ = true;
instruction_type = opcode.type_;
size ++;
@@ -322,12 +314,8 @@
// floating point
succeeded = false;
break;
- case OT_V: // Word, doubleword or quadword, depending on operand-size
- // attribute.
- if (operand_is_64_bits_ && flag_operand & AM_I &&
- flag_operand & IOS_64)
- operand_bytes_ += OS_QUAD_WORD;
- else if (operand_is_32_bits_)
+ case OT_V: // Word or doubleword, depending on operand-size attribute.
+ if (operand_is_32_bits_)
operand_bytes_ += OS_DOUBLE_WORD;
else
operand_bytes_ += OS_WORD;

Powered by Google App Engine
This is Rietveld 408576698