// the Software without restriction, including without limitation the rights to
// use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
// of the Software, and to permit persons to whom the Software is furnished to do
-// so, subject to the following conditions:
+// so, subject to the following condition:
//
-// * Redistributions of source code must retain the above copyright notice,
-// this list of conditions and the following disclaimers.
-//
-// * Redistributions in binary form must reproduce the above copyright notice,
-// this list of conditions and the following disclaimers in the
-// documentation and/or other materials provided with the distribution.
-//
-// * The names of the Software's authors and/or contributors
-// may not be used to endorse or promote products derived from
-// this Software without specific prior written permission.
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
extern int rwshared_start, rwshared_page_end;
namespace Mem {
- extern IMappable physmem;
+ extern IMappable physmem, anonmem;
class AddrSpaceFactory {
public:
mf.access_IDLNS_Read = 1;
mf.access_IDLNS_Exec = 1;
- as->map(physmem, region, &vstart, mf,
- true, AddrSpace::map_protected);
+ as->map(physmem, region, &vstart, mf, AddrSpace::map_protected);
region.start = kvirt_to_phys(&rwshared_start);
region.end = kvirt_to_phys(&rwshared_page_end);
mf.access_IDLNS_Write = 1;
mf.CopyOnWrite = 1;
- as->map(physmem, region, &vstart, mf,
- true, AddrSpace::map_protected);
+ as->map(physmem, region, &vstart, mf, AddrSpace::map_protected);
- AllocFlags af = 0;
- vstart = Arch::stack_bottom;
- as->alloc_and_map(Arch::stack_top - vstart + 1, &vstart, af, mf);
+ // Leave the stack no-exec by default.
+ region.start = vstart = Arch::stack_bottom;
+ region.end = Arch::stack_top;
+ mf.CopyOnWrite = 0;
+ printf("vstart %llx\n", vstart);
+ as->map(anonmem, region, &vstart, mf);
*obj = static_cast<IAddrSpace>(*(as));
}
*addrspace = NULL;
}
- void AddrSpace::alloc_and_map(u64 len, u64 *vstart,
- AllocFlags aflags, MapFlags mflags)
- {
- // FIXME: implement
- }
-
bool AddrSpace::handle_fault(ulong vaddr, bool write, bool exec, bool user)
{
if (lock.held_by_curthread())
// gets its copy-on-write broken.
assert((oldflags & reqflags) == reqflags);
+ assert(!va->flags.FaultOnWrite || oldphys == phys);
return true;
}
}
void AddrSpace::map(IMappable ma, Region region, u64 *vstart,
- MapFlags mflags, bool from_kernel, int map_type)
+ MapFlags mflags, int map_type)
{
// FIXME: check alignment for VIPT caches
// FIXME: Implement the "Replace" map flag
if (*vstart != System::Mem::AddrSpace_ns::unspecified_start) {
vregion.start = *vstart;
- vregion.end = vregion.start + region.end - region.start + 1;
+ vregion.end = vregion.start + region.end - region.start;
if (is_process) {
if (!valid_addr(vregion.start))
}
if (*vstart == System::Mem::AddrSpace_ns::unspecified_start) {
- if (fixed)
+ if (fixed)
throw_idl(ResourceBusy, 2, countarray("varea overlap"));
if (!get_free_region(region.end - region.start + 1, vregion, prev))