Chromium Code Reviews| OLD | NEW | 
|---|---|
| 1 // Copyright 2013 the V8 project authors. All rights reserved. | 1 // Copyright 2013 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 8366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 8377 // proper word-endian behaviour. | 8377 // proper word-endian behaviour. | 
| 8378 static void PushPopJsspSimpleHelper(int reg_count, | 8378 static void PushPopJsspSimpleHelper(int reg_count, | 
| 8379 int claim, | 8379 int claim, | 
| 8380 int reg_size, | 8380 int reg_size, | 
| 8381 PushPopMethod push_method, | 8381 PushPopMethod push_method, | 
| 8382 PushPopMethod pop_method) { | 8382 PushPopMethod pop_method) { | 
| 8383 SETUP(); | 8383 SETUP(); | 
| 8384 | 8384 | 
| 8385 START(); | 8385 START(); | 
| 8386 | 8386 | 
| 8387 // Registers x8 and x9 are used by the macro assembler for debug code (for | 8387 // Registers ip0 and ip1 are used by the macro assembler for debug code (for | 
| 8388 // example in 'Pop'), so we can't use them here. We can't use jssp because it | 8388 // example in 'Pop'), so we can't use them here. We can't use jssp because it | 
| 8389 // will be the stack pointer for this test. | 8389 // will be the stack pointer for this test. | 
| 8390 static RegList const allowed = ~(x8.Bit() | x9.Bit() | jssp.Bit()); | 8390 static RegList const allowed = ~(ip0.Bit() | ip1.Bit() | jssp.Bit()); | 
| 
 
rmcilroy
2014/05/09 11:18:46
One last change required here - I think this is a
 
jbramley
2014/05/09 11:23:51
We used x8/x9 _and_ ip0/ip1: ip0/ip1 were for gene
 
rmcilroy
2014/05/09 11:30:56
The reason this fails now without this change is b
 
 | |
| 8391 if (reg_count == kPushPopJsspMaxRegCount) { | 8391 if (reg_count == kPushPopJsspMaxRegCount) { | 
| 8392 reg_count = CountSetBits(allowed, kNumberOfRegisters); | 8392 reg_count = CountSetBits(allowed, kNumberOfRegisters); | 
| 8393 } | 8393 } | 
| 8394 // Work out which registers to use, based on reg_size. | 8394 // Work out which registers to use, based on reg_size. | 
| 8395 Register r[kNumberOfRegisters]; | 8395 Register r[kNumberOfRegisters]; | 
| 8396 Register x[kNumberOfRegisters]; | 8396 Register x[kNumberOfRegisters]; | 
| 8397 RegList list = PopulateRegisterArray(NULL, x, r, reg_size, reg_count, | 8397 RegList list = PopulateRegisterArray(NULL, x, r, reg_size, reg_count, | 
| 8398 allowed); | 8398 allowed); | 
| 8399 | 8399 | 
| 8400 // The literal base is chosen to have two useful properties: | 8400 // The literal base is chosen to have two useful properties: | 
| (...skipping 2557 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 10958 if (RelocInfo::IsVeneerPool(info->rmode())) { | 10958 if (RelocInfo::IsVeneerPool(info->rmode())) { | 
| 10959 ASSERT(info->data() == veneer_pool_size); | 10959 ASSERT(info->data() == veneer_pool_size); | 
| 10960 ++pool_count; | 10960 ++pool_count; | 
| 10961 } | 10961 } | 
| 10962 } | 10962 } | 
| 10963 | 10963 | 
| 10964 ASSERT(pool_count == 2); | 10964 ASSERT(pool_count == 2); | 
| 10965 | 10965 | 
| 10966 TEARDOWN(); | 10966 TEARDOWN(); | 
| 10967 } | 10967 } | 
| OLD | NEW |