diff options
| author | Amlal El Mahrouss <amlal@nekernel.org> | 2025-04-16 18:15:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-16 18:15:13 +0200 |
| commit | 0033ef41f33ce3d39b4e7ed7e1353cec916bdd5d (patch) | |
| tree | cf298a3b522fed5b829c4b250932ab13ef407838 /public | |
| parent | d3cf45311cf3f6de0bc25bb0ddb5c14a29a72cd6 (diff) | |
| parent | 58b3d776ab5435de352217b2a3a525aeb9316e99 (diff) | |
Merge pull request #19 from amlel-el-mahrouss/dev
urgent patches.
Diffstat (limited to 'public')
| -rw-r--r-- | public/frameworks/CoreFoundation.fwrk/CoreFoundation.json | 1 | ||||
| -rw-r--r-- | public/frameworks/DiskImage.fwrk/DiskImage.json | 1 | ||||
| -rw-r--r-- | public/frameworks/DiskImage.fwrk/headers/DiskImage.h | 1 | ||||
| -rw-r--r-- | public/frameworks/KernelTest.fwrk/KernelTest.json | 1 | ||||
| -rw-r--r-- | public/tools/diutil/diutil.json | 4 | ||||
| -rw-r--r-- | public/tools/diutil/src/CommandLine.cc | 7 |
6 files changed, 5 insertions, 10 deletions
diff --git a/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json b/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json index e8ee3245..a208f57a 100644 --- a/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json +++ b/public/frameworks/CoreFoundation.fwrk/CoreFoundation.json @@ -5,7 +5,6 @@ "sources_path": ["src/*.cc"], "output_name": "./dist/libCoreFoundation.dylib", "compiler_flags": [ - "-fPIC", "-ffreestanding", "-shared", "-fno-rtti", diff --git a/public/frameworks/DiskImage.fwrk/DiskImage.json b/public/frameworks/DiskImage.fwrk/DiskImage.json index 0b97dafb..aaff409c 100644 --- a/public/frameworks/DiskImage.fwrk/DiskImage.json +++ b/public/frameworks/DiskImage.fwrk/DiskImage.json @@ -5,7 +5,6 @@ "sources_path": ["src/*.cc"], "output_name": "./dist/libDiskImage.dylib", "compiler_flags": [ - "-fPIC", "-ffreestanding", "-shared", "-fno-rtti", diff --git a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h index 1dc23c0a..c0566485 100644 --- a/public/frameworks/DiskImage.fwrk/headers/DiskImage.h +++ b/public/frameworks/DiskImage.fwrk/headers/DiskImage.h @@ -10,7 +10,6 @@ #pragma once #include <user/SystemCalls.h> -#include <NewKit/Defines.h> #define kDISectorSz (512) #define kDIMinDiskSz mib_cast(1) diff --git a/public/frameworks/KernelTest.fwrk/KernelTest.json b/public/frameworks/KernelTest.fwrk/KernelTest.json index 93207890..aa70db30 100644 --- a/public/frameworks/KernelTest.fwrk/KernelTest.json +++ b/public/frameworks/KernelTest.fwrk/KernelTest.json @@ -5,7 +5,6 @@ "sources_path": ["src/*.cc"], "output_name": "./dist/libKernelTest.dylib", "compiler_flags": [ - "-fPIC", "-ffreestanding", "-shared", "-fno-rtti", diff --git a/public/tools/diutil/diutil.json b/public/tools/diutil/diutil.json index 0805e69f..19b845c5 100644 --- a/public/tools/diutil/diutil.json +++ b/public/tools/diutil/diutil.json @@ -1,8 +1,8 @@ { "compiler_path": "g++", "compiler_std": "c++20", - "headers_path": ["./", "../../../dev/kernel", "../../../dev/", "./"], - "sources_path": ["src/CommandLine.cc"], + "headers_path": ["./", "../../../dev/kernel", "../../../public/frameworks/", "../../../dev/", "./"], + "sources_path": ["src/CommandLine.cc", "../../../public/frameworks/DiskImage.fwrk/src/*.cc", "../../../dev/user/src/*.cc"], "output_name": "./dist/diutil", "cpp_macros": [ "kDUTILVersion=0x0100", diff --git a/public/tools/diutil/src/CommandLine.cc b/public/tools/diutil/src/CommandLine.cc index 61154e7a..9f11e778 100644 --- a/public/tools/diutil/src/CommandLine.cc +++ b/public/tools/diutil/src/CommandLine.cc @@ -11,14 +11,13 @@ static const Char kDiskName[kDIDiskNameLen] = "Disk"; static SInt32 kDiskSectorSz = 512; -static const SInt32 kDiskBlockCnt = 1; static SizeT kDiskSz = gib_cast(4); static const Char kOutDisk[kDIOutNameLen] = "disk.eimg"; /// @brief Filesystem tool entrypoint. int main(int argc, char** argv) { - for (SizeT arg = 0; arg < argc; ++arg) + for (SInt32 arg = 0; arg < argc; ++arg) { const Char* arg_s = argv[arg]; @@ -33,14 +32,14 @@ int main(int argc, char** argv) { if ((arg + 1) < argc) { - kDiskSz = MathToNumber(argv[arg + 1], nullptr, 10); + kDiskSz = StrMathToNumber(argv[arg + 1], nullptr, 10); } } else if (MmCmpMemory((VoidPtr)arg_s, (VoidPtr) "--disk-sector-size", MmStrLen("--disk-sector-size") == 0)) { if ((arg + 1) < argc) { - kDiskSectorSz = MathToNumber(argv[arg + 1], nullptr, 10); + kDiskSectorSz = StrMathToNumber(argv[arg + 1], nullptr, 10); } } else if (MmCmpMemory((VoidPtr)arg_s, (VoidPtr) "--disk-part-name", MmStrLen("--disk-part-name") == 0)) |