versions shifted
Rene Ladan
rene at freebsd.org
Sun Mar 20 22:16:36 UTC 2011
Op 20-03-2011 23:09, George Liaskos schreef:
>> The v8.diff patch has some hunks that do not apply, and some offsets are
>> quite large (500+ lines). Is this patch for 10.0.648.151 ?
>
> Yes, you should apply it at the v8 subdirectory
> [chromium-courgette-redacted-10.0.648.151/v8]
>
I tried that, but I get these results (the .rej files are attached):
acer % patch -p0 <~/v8.diff
Hmm... Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/ia32/code-stubs-ia32.cc
|===================================================================
|--- src/ia32/code-stubs-ia32.cc (revision 7153)
|+++ src/ia32/code-stubs-ia32.cc (working copy)
--------------------------
Patching file src/ia32/code-stubs-ia32.cc using Plan A...
Hunk #1 succeeded at 5467 (offset -42 lines).
Hunk #2 succeeded at 5885 (offset -42 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/ia32/full-codegen-ia32.cc
|===================================================================
|--- src/ia32/full-codegen-ia32.cc (revision 7153)
|+++ src/ia32/full-codegen-ia32.cc (working copy)
--------------------------
Patching file src/ia32/full-codegen-ia32.cc using Plan A...
Hunk #1 succeeded at 2959 (offset -90 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/assembler-x64.h
|===================================================================
|--- src/x64/assembler-x64.h (revision 7153)
|+++ src/x64/assembler-x64.h (working copy)
--------------------------
Patching file src/x64/assembler-x64.h using Plan A...
Hunk #1 succeeded at 636 (offset -20 lines).
Hunk #2 succeeded at 661 (offset -20 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/code-stubs-x64.cc
|===================================================================
|--- src/x64/code-stubs-x64.cc (revision 7153)
|+++ src/x64/code-stubs-x64.cc (working copy)
--------------------------
Patching file src/x64/code-stubs-x64.cc using Plan A...
Hunk #1 succeeded at 1699 (offset -545 lines).
Hunk #2 succeeded at 1761 (offset -545 lines).
Hunk #3 succeeded at 4066 (offset -94 lines).
Hunk #4 succeeded at 3920 (offset -593 lines).
Hunk #5 succeeded at 4441 (offset -94 lines).
Hunk #6 succeeded at 3952 (offset -593 lines).
Hunk #7 succeeded at 4472 (offset -94 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/codegen-x64.cc
|===================================================================
|--- src/x64/codegen-x64.cc (revision 7153)
|+++ src/x64/codegen-x64.cc (working copy)
--------------------------
Patching file src/x64/codegen-x64.cc using Plan A...
Hunk #1 succeeded at 760 (offset -6 lines).
Hunk #2 succeeded at 788 (offset -6 lines).
Hunk #3 succeeded at 1030 (offset -6 lines).
Hunk #4 succeeded at 2102 (offset -6 lines).
Hunk #5 succeeded at 2288 (offset -6 lines).
Hunk #6 succeeded at 2298 (offset -6 lines).
Hunk #7 succeeded at 2307 (offset -6 lines).
Hunk #8 succeeded at 2568 (offset -6 lines).
Hunk #9 succeeded at 3855 (offset -1 lines).
Hunk #10 succeeded at 6182 (offset -15 lines).
Hunk #11 succeeded at 6224 (offset -1 lines).
Hunk #12 succeeded at 6767 (offset -15 lines).
Hunk #13 succeeded at 6824 (offset -1 lines).
Hunk #14 succeeded at 8485 (offset -30 lines).
Hunk #15 succeeded at 8542 (offset -1 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/full-codegen-x64.cc
|===================================================================
|--- src/x64/full-codegen-x64.cc (revision 7153)
|+++ src/x64/full-codegen-x64.cc (working copy)
--------------------------
Patching file src/x64/full-codegen-x64.cc using Plan A...
Hunk #1 failed at 549.
Hunk #2 succeeded at 865 (offset -130 lines).
Hunk #3 succeeded at 2430 (offset -72 lines).
Hunk #4 succeeded at 2434 (offset -130 lines).
Hunk #5 failed at 2880.
2 out of 5 hunks failed--saving rejects to src/x64/full-codegen-x64.cc.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/lithium-codegen-x64.cc
|===================================================================
|--- src/x64/lithium-codegen-x64.cc (revision 7153)
|+++ src/x64/lithium-codegen-x64.cc (working copy)
--------------------------
Patching file src/x64/lithium-codegen-x64.cc using Plan A...
Hunk #1 succeeded at 786 (offset -439 lines).
Hunk #2 failed at 1738.
Hunk #3 failed at 3172.
2 out of 3 hunks failed--saving rejects to
src/x64/lithium-codegen-x64.cc.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/macro-assembler-x64.cc
|===================================================================
|--- src/x64/macro-assembler-x64.cc (revision 7153)
|+++ src/x64/macro-assembler-x64.cc (working copy)
--------------------------
Patching file src/x64/macro-assembler-x64.cc using Plan A...
Hunk #1 succeeded at 109 (offset -15 lines).
Hunk #2 succeeded at 138 (offset -15 lines).
Hunk #3 succeeded at 835 (offset -2 lines).
Hunk #4 succeeded at 853 (offset -15 lines).
Hunk #5 succeeded at 1385 (offset -2 lines).
Hunk #6 succeeded at 1382 (offset -15 lines).
Hunk #7 succeeded at 1742 (offset -46 lines).
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--------------------------
|Index: src/x64/macro-assembler-x64.h
|===================================================================
|--- src/x64/macro-assembler-x64.h (revision 7153)
|+++ src/x64/macro-assembler-x64.h (working copy)
--------------------------
Patching file src/x64/macro-assembler-x64.h using Plan A...
Hunk #1 succeeded at 256 (offset -22 lines).
Hunk #2 succeeded at 602 (offset -8 lines).
Hunk #3 succeeded at 657 (offset -48 lines).
done
acer %
--
http://www.rene-ladan.nl:8080/
GPG fingerprint = ADBC ECCD EB5F A6B4 549F 600D 8C9E 647A E564 2BFC
(subkeys.pgp.net)
-------------- next part --------------
***************
*** 549,555 ****
__ CompareRoot(result_register(), Heap::kFalseValueRootIndex);
__ j(equal, if_false);
STATIC_ASSERT(kSmiTag == 0);
- __ SmiCompare(result_register(), Smi::FromInt(0));
__ j(equal, if_false);
Condition is_smi = masm_->CheckSmi(result_register());
__ j(is_smi, if_true);
--- 549,555 ----
__ CompareRoot(result_register(), Heap::kFalseValueRootIndex);
__ j(equal, if_false);
STATIC_ASSERT(kSmiTag == 0);
+ __ Cmp(result_register(), Smi::FromInt(0));
__ j(equal, if_false);
Condition is_smi = masm_->CheckSmi(result_register());
__ j(is_smi, if_true);
***************
*** 2880,2887 ****
// Fetch the map and check if array is in fast case.
// Check that object doesn't require security checks and
// has no indexed interceptor.
- __ CmpObjectType(object, FIRST_JS_OBJECT_TYPE, temp);
- __ j(below, &slow_case);
__ testb(FieldOperand(temp, Map::kBitFieldOffset),
Immediate(KeyedLoadIC::kSlowCaseBitFieldMask));
__ j(not_zero, &slow_case);
--- 2880,2887 ----
// Fetch the map and check if array is in fast case.
// Check that object doesn't require security checks and
// has no indexed interceptor.
+ __ CmpObjectType(object, JS_ARRAY_TYPE, temp);
+ __ j(not_equal, &slow_case);
__ testb(FieldOperand(temp, Map::kBitFieldOffset),
Immediate(KeyedLoadIC::kSlowCaseBitFieldMask));
__ j(not_zero, &slow_case);
-------------- next part --------------
***************
*** 1738,1745 ****
// Check for arguments adapter frame.
NearLabel done, adapted;
__ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
- __ SmiCompare(Operand(result, StandardFrameConstants::kContextOffset),
- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
__ j(equal, &adapted);
// No arguments adaptor frame.
--- 1738,1745 ----
// Check for arguments adapter frame.
NearLabel done, adapted;
__ movq(result, Operand(rbp, StandardFrameConstants::kCallerFPOffset));
+ __ Cmp(Operand(result, StandardFrameConstants::kContextOffset),
+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
__ j(equal, &adapted);
// No arguments adaptor frame.
***************
*** 3172,3186 ****
// Skip the arguments adaptor frame if it exists.
NearLabel check_frame_marker;
- __ SmiCompare(Operand(temp, StandardFrameConstants::kContextOffset),
- Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
__ j(not_equal, &check_frame_marker);
__ movq(temp, Operand(rax, StandardFrameConstants::kCallerFPOffset));
// Check the marker in the calling frame.
__ bind(&check_frame_marker);
- __ SmiCompare(Operand(temp, StandardFrameConstants::kMarkerOffset),
- Smi::FromInt(StackFrame::CONSTRUCT));
}
--- 3172,3186 ----
// Skip the arguments adaptor frame if it exists.
NearLabel check_frame_marker;
+ __ Cmp(Operand(temp, StandardFrameConstants::kContextOffset),
+ Smi::FromInt(StackFrame::ARGUMENTS_ADAPTOR));
__ j(not_equal, &check_frame_marker);
__ movq(temp, Operand(rax, StandardFrameConstants::kCallerFPOffset));
// Check the marker in the calling frame.
__ bind(&check_frame_marker);
+ __ Cmp(Operand(temp, StandardFrameConstants::kMarkerOffset),
+ Smi::FromInt(StackFrame::CONSTRUCT));
}
More information about the freebsd-chromium
mailing list