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

Side by Side Diff: src/arm/full-codegen-arm.cc

Issue 6286043: Direct call to eval passes strict mode through. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Code review feedback. Created 9 years, 10 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 | Annotate | Revision Log
« no previous file with comments | « src/arm/codegen-arm.cc ('k') | src/codegen-inl.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2011 the V8 project authors. All rights reserved. 1 // Copyright 2011 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 1905 matching lines...) Expand 10 before | Expand all | Expand 10 after
1916 __ ldr(r1, MemOperand(sp, arg_count * kPointerSize)); 1916 __ ldr(r1, MemOperand(sp, arg_count * kPointerSize));
1917 __ push(r1); 1917 __ push(r1);
1918 } else { 1918 } else {
1919 __ push(r2); 1919 __ push(r2);
1920 } 1920 }
1921 1921
1922 // Push the receiver of the enclosing function and do runtime call. 1922 // Push the receiver of the enclosing function and do runtime call.
1923 __ ldr(r1, 1923 __ ldr(r1,
1924 MemOperand(fp, (2 + scope()->num_parameters()) * kPointerSize)); 1924 MemOperand(fp, (2 + scope()->num_parameters()) * kPointerSize));
1925 __ push(r1); 1925 __ push(r1);
1926 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 3); 1926 // Push the strict mode flag
1927 __ mov(r1, Operand(Smi::FromInt(strict_mode_flag())));
1928 __ push(r1);
1929 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 4);
1927 1930
1928 // The runtime call returns a pair of values in r0 (function) and 1931 // The runtime call returns a pair of values in r0 (function) and
1929 // r1 (receiver). Touch up the stack with the right values. 1932 // r1 (receiver). Touch up the stack with the right values.
1930 __ str(r0, MemOperand(sp, (arg_count + 1) * kPointerSize)); 1933 __ str(r0, MemOperand(sp, (arg_count + 1) * kPointerSize));
1931 __ str(r1, MemOperand(sp, arg_count * kPointerSize)); 1934 __ str(r1, MemOperand(sp, arg_count * kPointerSize));
1932 } 1935 }
1933 1936
1934 // Record source position for debugger. 1937 // Record source position for debugger.
1935 SetSourcePosition(expr->position()); 1938 SetSourcePosition(expr->position());
1936 InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP; 1939 InLoopFlag in_loop = (loop_depth() > 0) ? IN_LOOP : NOT_IN_LOOP;
(...skipping 1685 matching lines...) Expand 10 before | Expand all | Expand 10 after
3622 __ mov(r1, Operand(r1, ASR, 1)); // Un-smi-tag value. 3625 __ mov(r1, Operand(r1, ASR, 1)); // Un-smi-tag value.
3623 __ add(pc, r1, Operand(masm_->CodeObject())); 3626 __ add(pc, r1, Operand(masm_->CodeObject()));
3624 } 3627 }
3625 3628
3626 3629
3627 #undef __ 3630 #undef __
3628 3631
3629 } } // namespace v8::internal 3632 } } // namespace v8::internal
3630 3633
3631 #endif // V8_TARGET_ARCH_ARM 3634 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « src/arm/codegen-arm.cc ('k') | src/codegen-inl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698