| /branches/network/kernel/arch/sparc64/include/atomic.h |
|---|
| 123,7 → 123,7 |
| "ldx %0, %2\n" |
| "brz %2, 0b\n" |
| "nop\n" |
| "ba 1b\n" |
| "ba %xcc, 1b\n" |
| "nop\n" |
| "2:\n" |
| : "+m" (*((uint64_t *) x)), "+r" (tmp1), "+r" (tmp2) : "r" (0) |
| /branches/network/kernel/arch/sparc64/include/trap/trap_table.h |
|---|
| 100,7 → 100,7 |
| .macro PREEMPTIBLE_HANDLER f |
| sethi %hi(\f), %g1 |
| b preemptible_handler |
| ba %xcc, preemptible_handler |
| or %g1, %lo(\f), %g1 |
| .endm |
| /branches/network/kernel/arch/sparc64/include/trap/mmu.h |
|---|
| 103,17 → 103,20 |
| * Note that branch-delay slots are used in order to save space. |
| */ |
| 0: |
| mov VA_DMMU_TAG_ACCESS, %g1 |
| ldxa [%g1] ASI_DMMU, %g1 ! read the faulting Context and VPN |
| sethi %hi(fast_data_access_mmu_miss_data_hi), %g7 |
| wr %g0, ASI_DMMU, %asi |
| ldxa [VA_DMMU_TAG_ACCESS] %asi, %g1 ! read the faulting Context and VPN |
| set TLB_TAG_ACCESS_CONTEXT_MASK, %g2 |
| andcc %g1, %g2, %g3 ! get Context |
| bnz 0f ! Context is non-zero |
| bnz %xcc, 0f ! Context is non-zero |
| andncc %g1, %g2, %g3 ! get page address into %g3 |
| bz 0f ! page address is zero |
| bz %xcc, 0f ! page address is zero |
| ldx [%g7 + %lo(end_of_identity)], %g4 |
| cmp %g3, %g4 |
| bgeu %xcc, 0f |
| sethi %hi(kernel_8k_tlb_data_template), %g2 |
| ldx [%g2 + %lo(kernel_8k_tlb_data_template)], %g2 |
| or %g3, %g2, %g2 |
| ldx [%g7 + %lo(kernel_8k_tlb_data_template)], %g2 |
| add %g3, %g2, %g2 |
| stxa %g2, [%g0] ASI_DTLB_DATA_IN_REG ! identity map the kernel page |
| retry |
| 138,8 → 141,7 |
| * Read the Tag Access register for the higher-level handler. |
| * This is necessary to survive nested DTLB misses. |
| */ |
| mov VA_DMMU_TAG_ACCESS, %g2 |
| ldxa [%g2] ASI_DMMU, %g2 |
| ldxa [VA_DMMU_TAG_ACCESS] %asi, %g2 |
| /* |
| * g2 will be passed as an argument to fast_data_access_mmu_miss(). |
| /branches/network/kernel/arch/sparc64/include/mm/frame.h |
|---|
| 73,6 → 73,8 |
| typedef union frame_address frame_address_t; |
| extern uintptr_t last_frame; |
| extern uintptr_t end_of_identity; |
| extern void frame_arch_init(void); |
| #define physmem_print() |
| /branches/network/kernel/arch/sparc64/include/drivers/sgcn.h |
|---|
| 37,6 → 37,7 |
| #include <arch/types.h> |
| #include <console/chardev.h> |
| #include <proc/thread.h> |
| /* number of bytes in the TOC magic, including the NULL-terminator */ |
| #define TOC_MAGIC_BYTES 8 |
| 116,11 → 117,17 |
| uint32_t out_wrptr; |
| } __attribute__ ((packed)) sgcn_buffer_header_t; |
| void sgcn_grab(void); |
| void sgcn_release(void); |
| indev_t *sgcnin_init(void); |
| void sgcnout_init(void); |
| typedef struct { |
| thread_t *thread; |
| indev_t *srlnin; |
| } sgcn_instance_t; |
| extern void sgcn_grab(void); |
| extern void sgcn_release(void); |
| extern sgcn_instance_t *sgcnin_init(void); |
| extern void sgcnin_wire(sgcn_instance_t *, indev_t *); |
| extern void sgcnout_init(void); |
| #endif |
| /** @} |
| /branches/network/kernel/arch/sparc64/include/drivers/kbd.h |
|---|
| 26,7 → 26,7 |
| * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| */ |
| /** @addtogroup sparc64 |
| /** @addtogroup sparc64 |
| * @{ |
| */ |
| /** @file |
| 38,15 → 38,6 |
| #include <arch/types.h> |
| #include <genarch/ofw/ofw_tree.h> |
| typedef enum { |
| KBD_UNKNOWN, |
| KBD_Z8530, |
| KBD_NS16550, |
| KBD_SGCN |
| } kbd_type_t; |
| extern kbd_type_t kbd_type; |
| extern void kbd_init(ofw_tree_node_t *node); |
| #endif |