secc
/
l4ka-pistachio
mirror of https://github.com/l4ka/pistachio.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Cleanup and renaming of ppc files to match x86 conventions.

This commit is contained in:
Jan Stoess 2010-07-14 17:04:41 +02:00
parent 876f5010a5
commit 66a84463f2
13 changed files with 29 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel/src/api/v4/smp.h
View File

@ -45,7 +45,7 @@ template<typename T> INLINE T *get_on_cpu(cpuid_t cpu, T *item)
bool ret = kspace->lookup_mapping(item, &pgent, &pgsize, cpu); bool ret = kspace->lookup_mapping(item, &pgent, &pgsize, cpu);
if (ret) if (ret)
return (T *) addr_offset(phys_to_virt(pgent->address(kspace, pgsize)), return (T *) addr_offset(phys_to_virt((addr_t)pgent->address(kspace, pgsize)),
addr_mask(item, page_mask (pgsize))); addr_mask(item, page_mask (pgsize)));
else else
return NULL; return NULL;

0
kernel/src/glue/v4-powerpc/pgent.h → kernel/src/arch/powerpc/pgent-pghash.h
View File

4
kernel/src/glue/v4-powerpc/pgent_inline.h → kernel/src/arch/powerpc/pgent-pghash_functions.h
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: src/glue/v4-powerpc/pgent_inline.h * File path: arch/powerpc/pgent-pghash_functions.h
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,7 +36,7 @@
#include <kmemory.h> #include <kmemory.h>
#include INC_GLUE(pgent.h) #include INC_ARCH(pgent.h)
#include INC_GLUE(space.h) #include INC_GLUE(space.h)
#include INC_GLUE(pghash.h) #include INC_GLUE(pghash.h)

10
kernel/src/glue/v4-powerpc/pgent-swtlb.h → kernel/src/arch/powerpc/pgent-swtlb.h
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: glue/v4-powerpc/pgent-swtlb.h * File path: arch/powerpc/pgent-swtlb.h
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -30,8 +30,9 @@
* $Id$ * $Id$
* *
********************************************************************/ ********************************************************************/
#ifndef __GLUE__V4_POWERPC__PGENT_SWTLB_H__ #ifndef __ARCH__POWERPC__PGENT_SWTLB_H__
#define __GLUE__V4_POWERPC__PGENT_SWTLB_H__ #define __ARCH__POWERPC__PGENT_SWTLB_H__
class space_t; class space_t;
class mapnode_t; class mapnode_t;
@ -143,5 +144,4 @@ public:
}; };
#endif /* !__ARCH__POWERPC__PGENT_SWTLB_H__ */
#endif /* !__GLUE__V4_POWERPC__PGENT_SWTLB_H__ */

2
kernel/src/glue/v4-powerpc/pgent-swtlb_inline.h → kernel/src/arch/powerpc/pgent-swtlb_functions.h
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: glue/v4-powerpc/pgent-swtlb_inline.h * File path: arch/powerpc/pgent-swtlb_functions.h
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without

14
kernel/src/arch/powerpc/pgent.h
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: src/arch/powerpc/pgent.h * File path: arch/powerpc/pgent.h
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -39,15 +39,11 @@
#endif #endif
#if defined(CONFIG_PPC_MMU_SEGMENTS) #if defined(CONFIG_PPC_MMU_SEGMENTS)
#include INC_ARCH(pgent-pghash.h)
#include INC_GLUE(pgent.h) #include INC_ARCH(pgent-pghash_functions.h)
#include INC_GLUE(pgent_inline.h)
#elif defined(CONFIG_PPC_MMU_TLB) #elif defined(CONFIG_PPC_MMU_TLB)
#include INC_ARCH(pgent-swtlb.h)
#include INC_GLUE(pgent-swtlb.h) #include INC_ARCH(pgent-swtlb_functions.h)
#include INC_GLUE(pgent-swtlb_inline.h)
#endif #endif
#if defined(CONFIG_NEW_MDB) #if defined(CONFIG_NEW_MDB)

3
kernel/src/glue/v4-powerpc/pghash.cc
View File

@ -33,10 +33,9 @@
#include <debug.h> #include <debug.h>
#include INC_API(kernelinterface.h) #include INC_API(kernelinterface.h)
#include INC_ARCH(pgent.h)
#include INC_GLUE(pghash.h) #include INC_GLUE(pghash.h)
#include INC_GLUE(space.h) #include INC_GLUE(space.h)
#include INC_GLUE(pgent_inline.h)
#define TRACE_PGHASH(x...) #define TRACE_PGHASH(x...)
//#define TRACE_PGHASH(x...) TRACEF(x) //#define TRACE_PGHASH(x...) TRACEF(x)

10
kernel/src/glue/v4-powerpc/resources_inline.h → kernel/src/glue/v4-powerpc/resource_functions.h
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: glue/v4-powerpc/resources_inline.h * File path: glue/v4-powerpc/resource_functions.h
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -30,9 +30,8 @@
* $Id$ * $Id$
* *
********************************************************************/ ********************************************************************/
#ifndef __GLUE__V4_POWERPC__RESOURCES_INLINE_H__ #ifndef __GLUE__V4_POWERPC__RESOURCE_FUNCTIONS_H__
#define __GLUE__V4_POWERPC__RESOURCES_INLINE_H__ #define __GLUE__V4_POWERPC__RESOURCE_FUNCTIONS_H__
#include INC_API(resources.h) #include INC_API(resources.h)
INLINE void thread_resources_t::fpu_unavail_exception( tcb_t *tcb ) INLINE void thread_resources_t::fpu_unavail_exception( tcb_t *tcb )
@ -115,4 +114,5 @@ INLINE void thread_resources_t::set_kernel_thread( tcb_t *tcb )
tcb->resource_bits += KERNEL_THREAD; tcb->resource_bits += KERNEL_THREAD;
} }
#endif /* !__GLUE__V4_POWERPC__RESOURCES_H__ */
#endif /* !__GLUE__V4_POWERPC__RESOURCE_FUNCTIONS_H__ */

6
kernel/src/glue/v4-powerpc/softhvm.cc
View File

@ -3,7 +3,7 @@
* Copyright (C) 1999-2010, Karlsruhe University * Copyright (C) 1999-2010, Karlsruhe University
* Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation * Copyright (C) 2008-2009, Volkmar Uhlig, IBM Corporation
* *
* File path: src/glue/v4-powerpc/softhvm.cc * File path: glue/v4-powerpc/softhvm.cc
* Description: * Description:
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -36,13 +36,13 @@
#include INC_ARCH(phys.h) #include INC_ARCH(phys.h)
#include INC_ARCH(softhvm.h) #include INC_ARCH(softhvm.h)
#include INC_ARCH(pgent.h)
#include INC_API(tcb.h) #include INC_API(tcb.h)
#include INC_API(schedule.h) #include INC_API(schedule.h)
#include INC_API(kernelinterface.h) #include INC_API(kernelinterface.h)
#include INC_GLUE(exception.h) #include INC_GLUE(exception.h)
#include INC_GLUE(pgent-swtlb_inline.h)
#define TRACE_EMUL(args...) #define TRACE_EMUL(args...)
#define MAX_INSTR_EMULATE 10 #define MAX_INSTR_EMULATE 10
@ -249,7 +249,7 @@ space_t::handle_hvm_tlb_miss(ppc_softhvm_t *vm, ppc_softhvm_t::tlb_t *tlbentry,
return false; return false;
size_t hsize = page_shift (pgsize); size_t hsize = page_shift (pgsize);
paddr_t hpaddr = pg->paddress (this, pgsize) | (gpaddr & ((1ull << hsize) - 1)); paddr_t hpaddr = pg->address (this, pgsize) | (gpaddr & ((1ull << hsize) - 1));
/* we have a valid entry in the TLB and in the ptab --> we /* we have a valid entry in the TLB and in the ptab --> we
* can create a TLB entry */ * can create a TLB entry */

4
kernel/src/glue/v4-powerpc/space.h
View File

@ -42,9 +42,9 @@
#include INC_API(thread.h) #include INC_API(thread.h)
#if defined(CONFIG_PPC_MMU_SEGMENTS) #if defined(CONFIG_PPC_MMU_SEGMENTS)
#include INC_GLUE(pgent.h) #include INC_ARCH(pgent-pghash.h)
#else #else
#include INC_GLUE(pgent-swtlb.h) #include INC_ARCH(pgent-swtlb.h)
#include INC_ARCH(swtlb.h) #include INC_ARCH(swtlb.h)
#define HAVE_ARCH_FREE_SPACE #define HAVE_ARCH_FREE_SPACE
#include INC_ARCH(softhvm.h) #include INC_ARCH(softhvm.h)

2
kernel/src/glue/v4-powerpc/tcb.h
View File

@ -36,7 +36,7 @@
#include INC_ARCH(msr.h) #include INC_ARCH(msr.h)
#include INC_API(syscalls.h) #include INC_API(syscalls.h)
#include INC_API(ipc.h) #include INC_API(ipc.h)
#include INC_GLUE(resources_inline.h) #include INC_GLUE(resource_functions.h)
#define TRACE_TCB(x...) #define TRACE_TCB(x...)
//#define TRACE_TCB(x...) TRACEF(x) //#define TRACE_TCB(x...) TRACEF(x)

4
kernel/src/platform/ofpower3/opic.cc
View File

@ -34,9 +34,9 @@
#include INC_GLUE(intctrl.h) #include INC_GLUE(intctrl.h)
#include INC_ARCH(1275tree.h) #include INC_ARCH(1275tree.h)
#include INC_PLAT(opic.h) #include INC_ARCH(pgent.h)
#include INC_ARCH(segment.h) #include INC_ARCH(segment.h)
#include INC_GLUE(pgent_inline.h) #include INC_PLAT(opic.h)
intctrl_t intctrl; intctrl_t intctrl;

2
kernel/src/platform/ofpower4/xics.cc
View File

@ -33,11 +33,11 @@
#include INC_GLUE(intctrl.h) #include INC_GLUE(intctrl.h)
#include INC_ARCH(rtas.h) #include INC_ARCH(rtas.h)
#include INC_ARCH(1275tree.h) #include INC_ARCH(1275tree.h)
#include INC_ARCH(pgent.h)
#include INC_PLAT(xics.h) #include INC_PLAT(xics.h)
#include INC_PLAT(prom.h) #include INC_PLAT(prom.h)
#include INC_GLUE(space.h) #include INC_GLUE(space.h)
#include INC_GLUE(pghash.h) #include INC_GLUE(pghash.h)
#include INC_GLUE(pgent_inline.h)
intctrl_t intctrl; intctrl_t intctrl;