inokinoki / xnu-bcm2837-hackintosh Goto Github PK

/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_shared_region.c:1067:24: error: no member named 'disable_jop' in 'struct pmap'
            !task->map->pmap->disable_jop) {
             ~~~~~~~~~~~~~~~  ^

struct pmap {
	tt_entry_t              *XNU_PTRAUTH_SIGNED_PTR("pmap.tte") tte; /* translation table entries */
	pmap_paddr_t            ttep;                   /* translation table physical */
	vm_map_address_t        min;                    /* min address in pmap */
	vm_map_address_t        max;                    /* max address in pmap */
#if ARM_PARAMETERIZED_PMAP
	const struct page_table_attr * pmap_pt_attr;    /* details about page table layout */
#endif /* ARM_PARAMETERIZED_PMAP */
	ledger_t                ledger;                 /* ledger tracking phys mappings */

	decl_lck_rw_data(, rwlock);

	struct pmap_statistics  stats;          /* map statistics */
	queue_chain_t           pmaps;                  /* global list of pmaps */
	tt_entry_t                      *tt_entry_free; /* free translation table entries */
	struct pmap                     *XNU_PTRAUTH_SIGNED_PTR("pmap.nested_pmap") nested_pmap;   /* nested pmap */
	vm_map_address_t        nested_region_addr;
	vm_map_offset_t         nested_region_size;
	vm_map_offset_t         nested_region_true_start;
	vm_map_offset_t         nested_region_true_end;
	unsigned int            *nested_region_asid_bitmap;

#if (__ARM_VMSA__ <= 7)
	unsigned int            tte_index_max;          /* max tte index in translation table entries */
#endif

	void *                  reserved0;
	void *                  reserved1;
	uint64_t                reserved2;
	uint64_t                reserved3;

	unsigned int            stamp;                  /* creation stamp */
	_Atomic int32_t         ref_count;              /* pmap reference count */
	unsigned int            gc_status;              /* gc status */
	unsigned int            nested_region_asid_bitmap_size;
	uint32_t                nested_no_bounds_refcnt;/* number of pmaps that nested this pmap without bounds set */
	uint16_t                hw_asid;
	uint8_t                 sw_asid;

#if MACH_ASSERT
	int                     pmap_pid;
	char                    pmap_procname[17];
	bool            pmap_stats_assert;
#endif /* MACH_ASSERT */
	bool                    reserved4;
	bool                    pmap_vm_map_cs_enforced;
	boolean_t               reserved5;
	uint64_t                reserved6;
	uint64_t                reserved7;
	bool                    reserved8;
	bool                    reserved9;
#if DEVELOPMENT || DEBUG
	bool            footprint_suspended;
	bool            footprint_was_suspended;
#endif /* DEVELOPMENT || DEBUG */
	bool            nx_enabled;                             /* no execute */
	bool            nested;                                 /* is nested */
	bool            is_64bit;                               /* is 64bit */
	bool            nested_has_no_bounds_ref;       /* nested a pmap when the bounds were not set */
	bool            nested_bounds_set;                      /* The nesting bounds have been set */
#if HAS_APPLE_PAC
	bool            disable_jop;
#else
	bool            reserved10;
#endif /* HAS_APPLE_PAC */
};

make[4]: -db: Command not found

# Platform-specific tools
ifneq ($(filter $(SUPPORTED_EMBEDDED_PLATFORMS),$(PLATFORM)),)
ifeq ($(EMBEDDED_DEVICE_MAP),)
	export EMBEDDED_DEVICE_MAP := $(shell $(XCRUN) -sdk $(SDKROOT) -find embedded_device_map)
endif
EDM_DBPATH ?= $(PLATFORMPATH)/usr/local/standalone/firmware/device_map.db
endif

/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_shared_region.c:1135:28: error: no member named 'jop_pid' in 'struct task'
                    use_ptr_auth ? task->jop_pid : 0);
                                   ~~~~  ^

#if defined(HAS_APPLE_PAC)
#define TASK_ADDITIONS_PAC \
	uint64_t rop_pid; \
	uint64_t jop_pid; \
	uint8_t disable_user_jop;
#else
#define TASK_ADDITIONS_PAC
#endif

#define MACHINE_TASK \
	void* task_debug; \
	TASK_ADDITIONS_PAC \

/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_shared_region.c:2835:24: error: implicit declaration of function 'pmap_sign_user_ptr' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                                value = (uintptr_t)pmap_sign_user_ptr((void *)value, key, discriminator, jop_key);
                                                   ^
/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_shared_region_pager.c:227:23: error: implicit declaration of function 'ml_default_jop_pid' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
                        new->srk_jop_key = ml_default_jop_pid();
                                           ^

/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/iokit/Kernel/IOPMrootDomain.cpp:4084:4: error: use of undeclared identifier 'vm_pageout_wait'
                        vm_pageout_wait(AbsoluteTime_to_scalar(&deadline));

/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_map.c:1298:10: error: no member named 'vmmap_high_start' in 'struct _vm_map'
        result->vmmap_high_start = 0;
        ~~~~~~  ^
/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_map.c:2707:12: error: no member named 'vmmap_high_start' in 'struct _vm_map'
                    map->vmmap_high_start != 0) {
                    ~~~  ^
/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_map.c:2708:17: error: no member named 'vmmap_high_start' in 'struct _vm_map'
                        start = map->vmmap_high_start;
                                ~~~  ^
/Users/inoki/Build/bigsur-arm64/xnu-7195.81.3/osfmk/vm/vm_map.c:20996:7: error: no member named 'vmmap_high_start' in 'struct _vm_map'
        map->vmmap_high_start = high_start;

#  KERNEL_BASE =    [ arm64 xsmall msgb_small config_embedded config_requires_u32_munging config_zcache ARM_EXTRAS_BASE ]

struct _vm_map {
	lck_rw_t                lock;           /* map lock */
	struct vm_map_header    hdr;            /* Map entry header */
#define min_offset              hdr.links.start /* start of range */
#define max_offset              hdr.links.end   /* end of range */
	pmap_t                  XNU_PTRAUTH_SIGNED_PTR("_vm_map.pmap") pmap;           /* Physical map */
	vm_map_size_t           size;           /* virtual size */
	vm_map_size_t           user_wire_limit;/* rlimit on user locked memory */
	vm_map_size_t           user_wire_size; /* current size of user locked memory in this map */
#if !CONFIG_EMBEDDED
	vm_map_offset_t         vmmap_high_start;
#endif

ifneq ($(filter ARM ARM64,$(CURRENT_ARCH_CONFIG)),)

ifneq ($(findstring _Sim,$(RC_ProjectName)),)
ARCH_FLAGS_ARM64          = -arch arm64
else ifneq ($(findstring _host,$(RC_ProjectName)),)
ARCH_FLAGS_ARM64          = -arch arm64
else

ifndef ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG

ifneq ($(EMBEDDED_DEVICE_MAP),)
export ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG := $(shell $(EMBEDDED_DEVICE_MAP) -db $(EDM_DBPATH) -query SELECT DISTINCT KernelMachOArchitecture FROM Targets WHERE KernelPlatform IS \"$(CURRENT_MACHINE_CONFIG_LC)\" LIMIT 1 || echo UNKNOWN )
else
# Without embdedded device map, use a default arch string
export ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG := $(shell echo $(CURRENT_ARCH_CONFIG) | tr A-Z a-z)
ifneq ($(filter ARM64,$(CURRENT_ARCH_CONFIG)),)
export ARCH_STRING_FOR_CURRENT_MACHINE_CONFIG := arm64
endif
endif
endif