From 3347073aaa031b71e5063192f0806d83e9021c34 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Sat, 12 Oct 2024 09:20:54 +0200 Subject: IMP: Add same contract for RLE and GZip (CompressKit) IMP: Remove useless macro inside PageMgr.cxx. IMP: Remove XCode project. Signed-off-by: Amlal El Mahrouss --- dev/zba/src/BootloaderRsrc.rsrc | 2 +- dev/zka/CompressKit/GZip.hxx | 5 +- dev/zka/CompressKit/RLE.hxx | 4 +- dev/zka/src/PageMgr.cxx | 3 - minoskrnl/zka-dev.xcodeproj/project.pbxproj | 386 --------------------- .../xcshareddata/IDEWorkspaceChecks.plist | 8 - .../xcshareddata/xcschemes/crt.xcscheme | 71 ---- .../xcshareddata/xcschemes/minoskrnl.xcscheme | 67 ---- 8 files changed, 7 insertions(+), 539 deletions(-) delete mode 100644 minoskrnl/zka-dev.xcodeproj/project.pbxproj delete mode 100644 minoskrnl/zka-dev.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/crt.xcscheme delete mode 100644 minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/minoskrnl.xcscheme diff --git a/dev/zba/src/BootloaderRsrc.rsrc b/dev/zba/src/BootloaderRsrc.rsrc index 6aa1d5a5..8e341c16 100644 --- a/dev/zba/src/BootloaderRsrc.rsrc +++ b/dev/zba/src/BootloaderRsrc.rsrc @@ -9,7 +9,7 @@ BEGIN BLOCK "080904E4" BEGIN VALUE "CompanyName", "ZKA Technologies" - VALUE "FileDescription", "New OS Loader." + VALUE "FileDescription", "ZKA OS Loader." VALUE "FileVersion", BOOTLOADER_VERSION VALUE "InternalName", "newosldr" VALUE "LegalCopyright", "Copyright ZKA Technologies., all rights reserved." diff --git a/dev/zka/CompressKit/GZip.hxx b/dev/zka/CompressKit/GZip.hxx index 22391fe0..5c754aba 100644 --- a/dev/zka/CompressKit/GZip.hxx +++ b/dev/zka/CompressKit/GZip.hxx @@ -4,7 +4,8 @@ ------------------------------------------- */ -#pragma once +#ifndef __KERNELKIT_GZIP_HXX__ +#define __KERNELKIT_GZIP_HXX__ #include @@ -13,3 +14,5 @@ namespace Kernel::GZip class IGZipObject; class IGZipProxy; } // namespace Kernel::GZip + +#endif // !__KERNELKIT_GZIP_HXX__ diff --git a/dev/zka/CompressKit/RLE.hxx b/dev/zka/CompressKit/RLE.hxx index e79eede6..2aea42ef 100644 --- a/dev/zka/CompressKit/RLE.hxx +++ b/dev/zka/CompressKit/RLE.hxx @@ -11,8 +11,8 @@ namespace Kernel { - Void rle_compress(VoidPtr data, Size sz, VoidPtr out, Size out_sz); - Void rle_decompress(VoidPtr data, Size sz, VoidPtr out, Size out_sz); + class IRleObject; + class IRleProxy; } // namespace Kernel #endif // !ifndef __KERNELKIT_RLE_HXX__ diff --git a/dev/zka/src/PageMgr.cxx b/dev/zka/src/PageMgr.cxx index 3eefe491..5526da00 100644 --- a/dev/zka/src/PageMgr.cxx +++ b/dev/zka/src/PageMgr.cxx @@ -13,9 +13,6 @@ #include #endif // ifdef __ZKA_AMD64__ || defined(__ZKA_ARM64__) -//! null deref will throw (Page Zero detected, aborting app!) -#define kProtectedRegionEnd (512) - namespace Kernel { PTEWrapper::PTEWrapper(Boolean Rw, Boolean User, Boolean ExecDisable, UIntPtr VirtAddr) diff --git a/minoskrnl/zka-dev.xcodeproj/project.pbxproj b/minoskrnl/zka-dev.xcodeproj/project.pbxproj deleted file mode 100644 index 58e75db7..00000000 --- a/minoskrnl/zka-dev.xcodeproj/project.pbxproj +++ /dev/null @@ -1,386 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 56; - objects = { - -/* Begin PBXFileReference section */ - 1D5F70882CB94BAA00868632 /* zka-dev */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "zka-dev"; path = ..; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXGroup section */ - 1D5F707D2CB94B8200868632 = { - isa = PBXGroup; - children = ( - 1D5F70882CB94BAA00868632 /* zka-dev */, - ); - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXLegacyTarget section */ - 1D5F70892CB9772C00868632 /* ddk */ = { - isa = PBXLegacyTarget; - buildArgumentsString = ddk.json; - buildConfigurationList = 1D5F708A2CB9772C00868632 /* Build configuration list for PBXLegacyTarget "ddk" */; - buildPhases = ( - ); - buildToolPath = /usr/local/bin/btb; - buildWorkingDirectory = ../dev/crt; - dependencies = ( - ); - name = ddk; - passBuildSettingsInEnvironment = 1; - productName = ddk; - }; - 1D5F708D2CB9796200868632 /* crt */ = { - isa = PBXLegacyTarget; - buildArgumentsString = crt.json; - buildConfigurationList = 1D5F708E2CB9796200868632 /* Build configuration list for PBXLegacyTarget "crt" */; - buildPhases = ( - ); - buildToolPath = /usr/local/bin/btb; - buildWorkingDirectory = ../dev/crt; - dependencies = ( - ); - name = crt; - passBuildSettingsInEnvironment = 1; - productName = crt; - }; - 1D5F70912CB9798800868632 /* minoskrnl */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "-f amd64-efi.make"; - buildConfigurationList = 1D5F70922CB9798800868632 /* Build configuration list for PBXLegacyTarget "minoskrnl" */; - buildPhases = ( - ); - buildToolPath = /usr/local/bin/make; - buildWorkingDirectory = ../dev/zka; - dependencies = ( - ); - name = minoskrnl; - passBuildSettingsInEnvironment = 1; - productName = minoskrnl; - }; - 1D5F70952CB97AC000868632 /* sci */ = { - isa = PBXLegacyTarget; - buildArgumentsString = sci.json; - buildConfigurationList = 1D5F70962CB97AC000868632 /* Build configuration list for PBXLegacyTarget "sci" */; - buildPhases = ( - ); - buildToolPath = /usr/local/bin/btb; - buildWorkingDirectory = ../dev/sci; - dependencies = ( - ); - name = sci; - passBuildSettingsInEnvironment = 1; - productName = sci; - }; -/* End PBXLegacyTarget section */ - -/* Begin PBXProject section */ - 1D5F707E2CB94B8200868632 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - LastUpgradeCheck = 1540; - TargetAttributes = { - 1D5F70892CB9772C00868632 = { - CreatedOnToolsVersion = 15.4; - }; - 1D5F708D2CB9796200868632 = { - CreatedOnToolsVersion = 15.4; - }; - 1D5F70912CB9798800868632 = { - CreatedOnToolsVersion = 15.4; - }; - 1D5F70952CB97AC000868632 = { - CreatedOnToolsVersion = 15.4; - }; - }; - }; - buildConfigurationList = 1D5F70812CB94B8200868632 /* Build configuration list for PBXProject "zka-dev" */; - compatibilityVersion = "Xcode 14.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 1D5F707D2CB94B8200868632; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 1D5F70892CB9772C00868632 /* ddk */, - 1D5F708D2CB9796200868632 /* crt */, - 1D5F70912CB9798800868632 /* minoskrnl */, - 1D5F70952CB97AC000868632 /* sci */, - ); - }; -/* End PBXProject section */ - -/* Begin XCBuildConfiguration section */ - 1D5F70832CB94B8200868632 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - }; - name = Debug; - }; - 1D5F70842CB94B8200868632 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - }; - name = Release; - }; - 1D5F708B2CB9772C00868632 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 1D5F708C2CB9772C00868632 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 1D5F708F2CB9796200868632 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 1D5F70902CB9796200868632 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 1D5F70932CB9798800868632 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 1D5F70942CB9798800868632 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - 1D5F70972CB97AC000868632 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - 1D5F70982CB97AC000868632 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 1D5F70812CB94B8200868632 /* Build configuration list for PBXProject "zka-dev" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D5F70832CB94B8200868632 /* Debug */, - 1D5F70842CB94B8200868632 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1D5F708A2CB9772C00868632 /* Build configuration list for PBXLegacyTarget "ddk" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D5F708B2CB9772C00868632 /* Debug */, - 1D5F708C2CB9772C00868632 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1D5F708E2CB9796200868632 /* Build configuration list for PBXLegacyTarget "crt" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D5F708F2CB9796200868632 /* Debug */, - 1D5F70902CB9796200868632 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1D5F70922CB9798800868632 /* Build configuration list for PBXLegacyTarget "minoskrnl" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D5F70932CB9798800868632 /* Debug */, - 1D5F70942CB9798800868632 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1D5F70962CB97AC000868632 /* Build configuration list for PBXLegacyTarget "sci" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1D5F70972CB97AC000868632 /* Debug */, - 1D5F70982CB97AC000868632 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 1D5F707E2CB94B8200868632 /* Project object */; -} diff --git a/minoskrnl/zka-dev.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/minoskrnl/zka-dev.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist deleted file mode 100644 index 18d98100..00000000 --- a/minoskrnl/zka-dev.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - IDEDidComputeMac32BitWarning - - - diff --git a/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/crt.xcscheme b/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/crt.xcscheme deleted file mode 100644 index 7b1028fb..00000000 --- a/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/crt.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/minoskrnl.xcscheme b/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/minoskrnl.xcscheme deleted file mode 100644 index 9d49e77c..00000000 --- a/minoskrnl/zka-dev.xcodeproj/xcshareddata/xcschemes/minoskrnl.xcscheme +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3