i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added, fixed, cleaned and slightly optimized the assembly arch_int_*()

Browse Source 
functions.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5198 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2003-10-28 21:12:19 +00:00
parent e45975b879
commit d31fdd0e3c
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kernel/core/arch/ppc/arch_asm.S
+29 -18
View File
@@ -2,8 +2,11 @@
** Copyright 2003, Travis Geiselbrecht. All rights reserved. ** Copyright 2003, Travis Geiselbrecht. All rights reserved.
** Distributed under the terms of the NewOS License. ** Distributed under the terms of the NewOS License.
*/ */
#define FUNCTION(x) .global x; .type x,@function; x #define FUNCTION(x) .global x; .type x,@function; x
#define MSR_EXCEPTIONS_ENABLED 15
.text .text
// ToDo: fixme // ToDo: fixme
@@ -15,40 +18,48 @@ FUNCTION(reboot):
FUNCTION(arch_int_enable_interrupts): FUNCTION(arch_int_enable_interrupts):
mfmsr %r3 // load msr mfmsr %r3 // load msr
/*
li %r4, 1 li %r4, 1
insrwi %r3, %r4, 1, 16 // set the EE bit insrwi %r3, %r4, 1, 31 - MSR_EXCEPTIONS_ENABLED
*/ // sets bit 15, EE
li %r4, 0
ori %r4, %r4, (1 << 15) // create a mask for EE bit of MSR
or %r3, %r3, %r4 // set the EE bit
mtmsr %r3 // put it back into the msr mtmsr %r3 // put it back into the msr
blr blr
/* void arch_int_disable_interrupts(void) */
/* int arch_int_disable_interrupts(void)
* r3
*/
FUNCTION(arch_int_disable_interrupts): FUNCTION(arch_int_disable_interrupts):
mfmsr %r3 // load msr mfmsr %r4 // load msr
/* mr %r3, %r4 // save old state
li %r4, 0 rlwinm %r4, %r4, 0, 32 - MSR_EXCEPTIONS_ENABLED, 30 - MSR_EXCEPTIONS_ENABLED
rlwinm %r3, %r4, 15, 16, 16 // mask the EE bit // clears bit 15, EE
*/
li %r4, 0 mtmsr %r4 // put it back into the msr
ori %r4, %r4, (1 << 15) // create a mask for EE bit of MSR blr
andc %r3, %r3, %r4 // mask the EE bit
mtmsr %r3 // put it back into the msr
/* void arch_int_restore_interrupts(int oldState)
* r3
*/
FUNCTION(arch_int_restore_interrupts):
mfmsr %r4
rlwimi %r4, %r3, 0, 31 - MSR_EXCEPTIONS_ENABLED, 31 - MSR_EXCEPTIONS_ENABLED
// clear or set bit 15, EE to the same state as in r3, oldState
mtmsr %r4
blr blr
/* bool arch_int_are_interrupts_enabled(void) */ /* bool arch_int_are_interrupts_enabled(void) */
FUNCTION(arch_int_are_interrupts_enabled): FUNCTION(arch_int_are_interrupts_enabled):
mfmsr %r3 // load msr mfmsr %r3 // load msr
extrwi %r3, %r3, 1, 16 // mask out the EE bit extrwi %r3, %r3, 1, 31 - MSR_EXCEPTIONS_ENABLED
// mask out the EE bit
blr blr
// ToDo: fixme // ToDo: fixme
FUNCTION(dbg_save_registers): FUNCTION(dbg_save_registers):
blr blr