gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ldump2mcdump: move PAGE_SHIFT to arch-dependent includes

Browse Source 
Change-Id: I42e49db87e375f2dc094926e21dfc00e50484855
Fujitsu: POSTK_DEBUG_ARCH_DEP_94
This commit is contained in:
Dominique Martinet
2019-01-30 16:01:48 +09:00
parent f299fff266
commit e5de0b81ca
4 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
executer/user/Makefile.in
View File

@ -11,7 +11,7 @@ MCKERNEL_INCDIR=@MCKERNEL_INCDIR@
MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@ MCKERNEL_LIBDIR=@MCKERNEL_LIBDIR@
KDIR ?= @KDIR@ KDIR ?= @KDIR@
ARCH=@ARCH@ ARCH=@ARCH@
CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH} -I${IHKDIR} -I@abs_builddir@/../../../ihk/linux/include CFLAGS=-Wall -O -I. -I$(VPATH)/arch/${ARCH} -I${IHKDIR} -I@abs_builddir@/../../../ihk/linux/include -I$(VPATH)/arch/${ARCH}/include
LDFLAGS=@LDFLAGS@ LDFLAGS=@LDFLAGS@
CPPFLAGS_SYSCALL_INTERCEPT=@CPPFLAGS_SYSCALL_INTERCEPT@ CPPFLAGS_SYSCALL_INTERCEPT=@CPPFLAGS_SYSCALL_INTERCEPT@
LDFLAGS_SYSCALL_INTERCEPT=@LDFLAGS_SYSCALL_INTERCEPT@ LDFLAGS_SYSCALL_INTERCEPT=@LDFLAGS_SYSCALL_INTERCEPT@
@ -47,7 +47,7 @@ mcexec: mcexec.c libmcexec.a
# POSTK_DEBUG_ARCH_DEP_34, eclair arch depend separate. # POSTK_DEBUG_ARCH_DEP_34, eclair arch depend separate.
ifeq ($(ARCH), arm64) ifeq ($(ARCH), arm64)
eclair: eclair.c arch/$(ARCH)/arch-eclair.c eclair: eclair.c arch/$(ARCH)/arch-eclair.c
$(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include $(CFLAGS) -o $@ $^ $(LIBS) -ldl -lz $(CC) -I.. -I. -I./arch/$(ARCH)/include -I$(VPATH)/.. -I$(VPATH) $(CFLAGS) -o $@ $^ $(LIBS) -ldl -lz
else else
eclair: eclair.c arch/$(ARCH)/arch-eclair.c eclair: eclair.c arch/$(ARCH)/arch-eclair.c
$(CC) -I.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include $(CFLAGS) -o $@ $^ $(LIBS) $(CC) -I.. -I$(VPATH) -I$(VPATH)/arch/$(ARCH)/include $(CFLAGS) -o $@ $^ $(LIBS)

20
executer/user/arch/arm64/include/arch-ldump2mcdump.h Normal file
View File

@ -0,0 +1,20 @@
/* arch-ldump2mcdump.h COPYRIGHT FUJITSU LIMITED 2017-2018 */
#ifndef HEADER_USER_ARM64_LDUMP2MCDUMP_H
#define HEADER_USER_ARM64_LDUMP2MCDUMP_H
#ifdef CONFIG_ARM64_64K_PAGES
/* GRANULE_SIZE == 64K_PAGE */
#define PAGE_SHIFT 16
/* same as IHK_SMP_LARGE_PAGE_SHIFT */
#define LARGE_PAGE_SHIFT PAGE_SHIFT
#else /* CONFIG_ARM64_64K_PAGES */
/* GRANULE_SIZE == 4K_PAGE */
#define PAGE_SHIFT 12
/* same as IHK_SMP_LARGE_PAGE_SHIFT */
#define LARGE_PAGE_SHIFT 21
#endif /* CONFIG_ARM64_64K_PAGES */
#endif /* HEADER_USER_ARM64_LDUMP2MCDUMP_H */

8
executer/user/arch/x86_64/include/arch-ldump2mcdump.h Normal file
View File

@ -0,0 +1,8 @@
/* arch-ldump2mcdump.h COPYRIGHT FUJITSU LIMITED 2017 */
#ifndef HEADER_USER_X86_64_LDUMP2MCDUMP_H
#define HEADER_USER_X86_64_LDUMP2MCDUMP_H
#define PAGE_SHIFT 12
#define LARGE_PAGE_SHIFT 21
#endif /* HEADER_USER_X86_64_LDUMP2MCDUMP_H */

3
executer/user/ldump2mcdump.c
View File

@ -2,6 +2,7 @@
#include "../include/defs.h" /* From the crash source top-level directory */ #include "../include/defs.h" /* From the crash source top-level directory */
#include <bfd.h> #include <bfd.h>
#include <pwd.h> #include <pwd.h>
#include <arch-ldump2mcdump.h>
void ldump2mcdump_init(void); /* constructor function */ void ldump2mcdump_init(void); /* constructor function */
void ldump2mcdump_fini(void); /* destructor function (optional) */ void ldump2mcdump_fini(void); /* destructor function (optional) */
@ -56,8 +57,6 @@ typedef struct dump_mem_chunks_s {
#define DUMP_MEM_SYMBOL "dump_page_set_addr" #define DUMP_MEM_SYMBOL "dump_page_set_addr"
#define BOOTSTRAP_MEM_SYMBOL "dump_bootstrap_mem_start" #define BOOTSTRAP_MEM_SYMBOL "dump_bootstrap_mem_start"
#define MCDUMP_DEFAULT_FILENAME "mcdump" #define MCDUMP_DEFAULT_FILENAME "mcdump"
#define PAGE_SHIFT 12
#define LARGE_PAGE_SHIFT 21
#define LARGE_PAGE_SIZE (1UL << LARGE_PAGE_SHIFT) #define LARGE_PAGE_SIZE (1UL << LARGE_PAGE_SHIFT)
#define LARGE_PAGE_MASK (~((unsigned long)LARGE_PAGE_SIZE - 1)) #define LARGE_PAGE_MASK (~((unsigned long)LARGE_PAGE_SIZE - 1))