karlos/karlos
7
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

address _offset functions

Browse source
This commit is contained in:
uosfz 2025-03-17 16:55:18 +01:00
parent 0014a79ecb
commit ba6a17373e
Signed by: uosfz
SSH key fingerprint: SHA256:FlktuluyhTQg3jHZNLKwxOOC5hbfrUXM0tz3IA3lGJo
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/x86_64/address.h
View file

@ -26,6 +26,7 @@ struct va va_from_vpn(struct vpn vpn);
struct va va_from_vpn_with_offset(struct vpn vpn, uint64_t offset);
uint64_t va_to_value(struct va va);
uint64_t va_to_canonical(struct va va);
uint64_t va_offset(struct va va);
struct vpn vpn_from_pagenum(uint64_t pagenum);
struct vpn vpn_from_aligned_va(struct va va);
@ -37,6 +38,7 @@ struct pa pa_from_ppn(struct ppn ppn);
struct pa pa_from_ppn_with_offset(struct ppn ppn, uint64_t offset);
uint64_t pa_to_value(struct pa pa);
void *pa_to_pointer(struct pa pa);
uint64_t pa_offset(struct pa pa);
struct ppn ppn_from_pagenum(uint64_t pagenum);
struct ppn ppn_from_aligned_pa(struct pa pa);

8
src/x86_64/address.c
View file

@ -41,6 +41,10 @@ uint64_t va_to_canonical(struct va va) {
}
}
uint64_t va_offset(struct va va) {
return va.value & 0xfff;
}
struct vpn vpn_from_pagenum(uint64_t pagenum) {
ASSERT(pagenum < (1ull << 36));
return (struct vpn){ .pagenum = pagenum };
@ -81,6 +85,10 @@ void *pa_to_pointer(struct pa pa) {
return (void*)PHYS_TO_IDMAPPED(pa.value);
}
uint64_t pa_offset(struct pa pa) {
return pa.value & 0xfff;
}
struct ppn ppn_from_pagenum(uint64_t pagenum) {
ASSERT(pagenum < (1ull << 24));
return (struct ppn){ .pagenum = pagenum };

2
src/x86_64/mem.c
View file

@ -192,7 +192,7 @@ bool pt_translate(struct va va, struct ppn cr3, struct pa *pa_out) {
}
struct pt_entry ent;
pt_entry_unpack(*leaf_ptr, &ent);
*pa_out = pa_from_ppn_with_offset(ent.ppn, va_to_value(va) & 0xfff); // TODO offset func
*pa_out = pa_from_ppn_with_offset(ent.ppn, va_offset(va));
return true;
}