200,202d199
< //XXX Junk code to surpress the warning
< if (storeCheck);
<
582c579
< if (!attr.writable && mode == Write)
---
> if (!attr.writable && (mode == Write || storeCheck))
657a655,659
> if (storeCheck && !entry->writable) {
> // This would fault if this were a write, so return a page
> // fault that reflects that happening.
> return new PageFault(vaddr, true, Write, inUser, false);
> }