X64: Use CmpObjectType macro everywhere, fix problem with sign of instance ty...

src/x64/ic-x64.cc

 // Copyright 2009 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 194 matching lines @@
 
   // Move result to rdi and exit the internal frame.
   __ movq(rdi, rax);
   __ LeaveInternalFrame();
 
   // Check if the receiver is a global object of some sort.
   Label invoke, global;
   __ movq(rdx, Operand(rsp, (argc + 1) * kPointerSize));  // receiver
   __ testl(rdx, Immediate(kSmiTagMask));
   __ j(zero, &invoke);
-  __ movq(rcx, FieldOperand(rdx, HeapObject::kMapOffset));
-  __ movzxbq(rcx, FieldOperand(rcx, Map::kInstanceTypeOffset));
-  __ cmpq(rcx, Immediate(static_cast<int8_t>(JS_GLOBAL_OBJECT_TYPE)));
+  __ CmpObjectType(rdx, JS_GLOBAL_OBJECT_TYPE, rcx);
   __ j(equal, &global);
-  __ cmpq(rcx, Immediate(static_cast<int8_t>(JS_BUILTINS_OBJECT_TYPE)));
+  __ CmpInstanceType(rcx, JS_BUILTINS_OBJECT_TYPE);
   __ j(not_equal, &invoke);

[Lasse Reichstein, 2009/07/07 09:39:36]

Doesn't this do two loads of the instance type byte instead of just one before?

[William Hesse, 2009/07/08 07:53:43]

Yes, but only as two identical Operands.  I don't think there is any additional
memory traffic, because there are no writes to it.  So the read buffers and
caches should work.

 
   // Patch the receiver on the stack.
   __ bind(&global);
   __ movq(rdx, FieldOperand(rdx, GlobalObject::kGlobalReceiverOffset));
   __ movq(Operand(rsp, (argc + 1) * kPointerSize), rdx);
 
   // Invoke the function.
   ParameterCount actual(argc);
   __ bind(&invoke);
   __ InvokeFunction(rdi, actual, JUMP_FUNCTION);
@@ skipping 97 matching lines @@
 void StoreIC::GenerateMegamorphic(MacroAssembler* masm) {
   masm->int3();  // UNIMPLEMENTED.
   masm->movq(kScratchRegister, Immediate(0xCBAB));  // Debugging aid.
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal