Unified CallWrapper and PostCallGenerator classes, the former is a

src/ia32/assembler-ia32.cc

 // Copyright (c) 1994-2006 Sun Microsystems Inc.
 // 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.
 //
@@ skipping 1562 matching lines @@
 void Assembler::call(byte* entry, RelocInfo::Mode rmode) {
   positions_recorder()->WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
   ASSERT(!RelocInfo::IsCodeTarget(rmode));
   EMIT(0xE8);
   emit(entry - (pc_ + sizeof(int32_t)), rmode);
 }
 
 
+int Assembler::CallSize(const Operand& adr) {
+  return 1 /* EMIT */ + adr.len_ /* emit_operand */;

[Kevin Millikin (Chromium), 2011/05/03 08:43:19]

I find the inline comments distracting here.  I'd rather see:

// Call size is 1 (opcode) + adr.len_ (operand).
return 1 + adr.len_;

[Sven Panne, 2011/05/03 09:09:54]

Done.

+}
+
+
 void Assembler::call(const Operand& adr) {
   positions_recorder()->WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
   EMIT(0xFF);
   emit_operand(edx, adr);

[Kevin Millikin (Chromium), 2011/05/03 08:43:19]

You could ASSERT(pc_ - last_pc_ == CallSize(adr)), just to make something break
if the encoding of call was changed here and CallSize was not updated.

[Sven Panne, 2011/05/03 09:09:54]

Good idea, CallSize is a bit fragile.

 }
 
 
+int Assembler::CallSize(Handle<Code> code, RelocInfo::Mode rmode) {
+  return 1 /* EMIT */ + sizeof(uint32_t) /* emit */;
+}
+
+
 void Assembler::call(Handle<Code> code,
                      RelocInfo::Mode rmode,
                      unsigned ast_id) {
   positions_recorder()->WriteRecordedPositions();
   EnsureSpace ensure_space(this);
   last_pc_ = pc_;
   ASSERT(RelocInfo::IsCodeTarget(rmode));
   EMIT(0xE8);
   emit(reinterpret_cast<intptr_t>(code.location()), rmode, ast_id);
 }
@@ skipping 1237 matching lines @@
     fprintf(coverage_log, "%s\n", file_line);
     fflush(coverage_log);
   }
 }
 
 #endif
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_IA32