vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed cache invalidating

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2009-11-23 00:16:49 +01:00
parent 8719095cc8
commit 1c805a5a3e
2 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
kern/mips/cache.S
View file

@ -3,10 +3,27 @@
/* FIXME: This should invalidate only part of memory. */ /* FIXME: This should invalidate only part of memory. */
FUNCTION (grub_cpu_flush_cache) FUNCTION (grub_cpu_flush_cache)
FUNCTION (grub_arch_sync_caches) FUNCTION (grub_arch_sync_caches)
repeat: move $t2, $a0
cache 1, 0($a0) addu $t3, $a0, $a1
cache 0, 0($a0) srl $t2, $t2, 5
addiu $a0, $a0, 1 sll $t2, $t2, 5
addiu $a1, $a1, 0xffff addu $t3, $t3, 0x1f
bne $a1, $zero, repeat srl $t3, $t3, 5
j $31 sll $t3, $t3, 5
move $t0, $t2
subu $t1, $t3, $t2
r1:
cache 1, 0($t0)
addiu $t0, $t0, 0x1
addiu $t1, $t1, 0xffff
bne $t1, $zero, r1
sync
move $t0, $t2
subu $t1, $t3, $t2
r2:
cache 0, 0($t0)
addiu $t0, $t0, 0x1
addiu $t1, $t1, 0xffff
bne $t1, $zero, r2
sync
j $ra

4
lib/mips/relocator.c
View file

@ -81,7 +81,7 @@ write_call_relocator_bw (void *ptr0, void *src, grub_uint32_t dest,
for (i = 1; i < 32; i++) for (i = 1; i < 32; i++)
write_reg (i, state.gpr[i], &ptr); write_reg (i, state.gpr[i], &ptr);
write_jump (state.jumpreg, &ptr); write_jump (state.jumpreg, &ptr);
grub_arch_sync_caches (ptr0, ptr - ptr0); grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr - (grub_uint8_t *) ptr0);
grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0); grub_dprintf ("relocator", "Backward relocator: about to jump to %p\n", ptr0);
((void (*) (void)) ptr0) (); ((void (*) (void)) ptr0) ();
} }
@ -101,7 +101,7 @@ write_call_relocator_fw (void *ptr0, void *src, grub_uint32_t dest,
for (i = 1; i < 32; i++) for (i = 1; i < 32; i++)
write_reg (i, state.gpr[i], &ptr); write_reg (i, state.gpr[i], &ptr);
write_jump (state.jumpreg, &ptr); write_jump (state.jumpreg, &ptr);
grub_arch_sync_caches (ptr0, ptr - ptr0); grub_arch_sync_caches (ptr0, (grub_uint8_t *) ptr - (grub_uint8_t *) ptr0);
grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0); grub_dprintf ("relocator", "Forward relocator: about to jump to %p\n", ptr0);
((void (*) (void)) ptr0) (); ((void (*) (void)) ptr0) ();
} }