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

Side by Side Diff: src/ia32/ic-ia32.cc

Issue 163363003: Don't mix handler flags into regular flag compuation. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 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/compiler.cc ('k') | src/ic.cc » ('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 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 938 matching lines...) Expand 10 before | Expand all | Expand 10 after
949 949
950 void LoadIC::GenerateMegamorphic(MacroAssembler* masm, 950 void LoadIC::GenerateMegamorphic(MacroAssembler* masm,
951 ExtraICState extra_state) { 951 ExtraICState extra_state) {
952 // ----------- S t a t e ------------- 952 // ----------- S t a t e -------------
953 // -- ecx : name 953 // -- ecx : name
954 // -- edx : receiver 954 // -- edx : receiver
955 // -- esp[0] : return address 955 // -- esp[0] : return address
956 // ----------------------------------- 956 // -----------------------------------
957 957
958 // Probe the stub cache. 958 // Probe the stub cache.
959 Code::Flags flags = Code::ComputeFlags( 959 Code::Flags flags = Code::ComputeHandlerFlags(Code::LOAD_IC, extra_state);
960 Code::HANDLER, MONOMORPHIC, extra_state,
961 Code::NORMAL, Code::LOAD_IC);
962 masm->isolate()->stub_cache()->GenerateProbe( 960 masm->isolate()->stub_cache()->GenerateProbe(
963 masm, flags, edx, ecx, ebx, eax); 961 masm, flags, edx, ecx, ebx, eax);
964 962
965 // Cache miss: Jump to runtime. 963 // Cache miss: Jump to runtime.
966 GenerateMiss(masm); 964 GenerateMiss(masm);
967 } 965 }
968 966
969 967
970 void LoadIC::GenerateNormal(MacroAssembler* masm) { 968 void LoadIC::GenerateNormal(MacroAssembler* masm) {
971 // ----------- S t a t e ------------- 969 // ----------- S t a t e -------------
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 __ push(edx); // receiver 1056 __ push(edx); // receiver
1059 __ push(ecx); // name 1057 __ push(ecx); // name
1060 __ push(ebx); // return address 1058 __ push(ebx); // return address
1061 1059
1062 // Perform tail call to the entry. 1060 // Perform tail call to the entry.
1063 __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1); 1061 __ TailCallRuntime(Runtime::kKeyedGetProperty, 2, 1);
1064 } 1062 }
1065 1063
1066 1064
1067 void StoreIC::GenerateMegamorphic(MacroAssembler* masm, 1065 void StoreIC::GenerateMegamorphic(MacroAssembler* masm,
1068 ExtraICState extra_ic_state) { 1066 ExtraICState extra_state) {
1069 // ----------- S t a t e ------------- 1067 // ----------- S t a t e -------------
1070 // -- eax : value 1068 // -- eax : value
1071 // -- ecx : name 1069 // -- ecx : name
1072 // -- edx : receiver 1070 // -- edx : receiver
1073 // -- esp[0] : return address 1071 // -- esp[0] : return address
1074 // ----------------------------------- 1072 // -----------------------------------
1075 Code::Flags flags = Code::ComputeFlags( 1073 Code::Flags flags = Code::ComputeHandlerFlags(Code::STORE_IC, extra_state);
1076 Code::HANDLER, MONOMORPHIC, extra_ic_state,
1077 Code::NORMAL, Code::STORE_IC);
1078 masm->isolate()->stub_cache()->GenerateProbe( 1074 masm->isolate()->stub_cache()->GenerateProbe(
1079 masm, flags, edx, ecx, ebx, no_reg); 1075 masm, flags, edx, ecx, ebx, no_reg);
1080 1076
1081 // Cache miss: Jump to runtime. 1077 // Cache miss: Jump to runtime.
1082 GenerateMiss(masm); 1078 GenerateMiss(masm);
1083 } 1079 }
1084 1080
1085 1081
1086 void StoreIC::GenerateMiss(MacroAssembler* masm) { 1082 void StoreIC::GenerateMiss(MacroAssembler* masm) {
1087 // ----------- S t a t e ------------- 1083 // ----------- S t a t e -------------
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
1306 Condition cc = (check == ENABLE_INLINED_SMI_CHECK) 1302 Condition cc = (check == ENABLE_INLINED_SMI_CHECK)
1307 ? (*jmp_address == Assembler::kJncShortOpcode ? not_zero : zero) 1303 ? (*jmp_address == Assembler::kJncShortOpcode ? not_zero : zero)
1308 : (*jmp_address == Assembler::kJnzShortOpcode ? not_carry : carry); 1304 : (*jmp_address == Assembler::kJnzShortOpcode ? not_carry : carry);
1309 *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc); 1305 *jmp_address = static_cast<byte>(Assembler::kJccShortPrefix | cc);
1310 } 1306 }
1311 1307
1312 1308
1313 } } // namespace v8::internal 1309 } } // namespace v8::internal
1314 1310
1315 #endif // V8_TARGET_ARCH_IA32 1311 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/compiler.cc ('k') | src/ic.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698