Is this line too long now? Also, I'm not sure what's going on with the new 'IsStoreConditional' flag. Doesn't there need to be a load locked somewhere? Also, can't those fail? Would the x86 version of locking be more appropriate since it can't? Why is any flag necessary since the swap is (I think) done atomically through the memory request itself? Or are we moving away from that?

The only difference between this else if and the if above it is that activityThisCycle is called for the if but not the else if. I'm not sure that's correct, though admittedly the use of the activity stuff in O3 is a little mysterious to me, but in any case I don't think it would hurt anything to call it in both cases and merge those two blocks.