Compare commits
70 Commits
945d838166
...
462c48001f
Author | SHA1 | Date | |
---|---|---|---|
462c48001f | |||
fda3954964 | |||
7482ec1d89 | |||
d39c5a2dbe | |||
0ad2b33f5d | |||
3a1b9e1e73 | |||
7df2d44472 | |||
500a80a7f7 | |||
d1046e35a1 | |||
c7abee3fb6 | |||
a1a221ecb9 | |||
6855067b21 | |||
55ecc904c6 | |||
ed57e4eeaf | |||
b2015ed2a3 | |||
a4637a3b47 | |||
b5a166ec91 | |||
2ae5fcd318 | |||
72f632a5d8 | |||
573e42530f | |||
e096f4a5df | |||
25e03e4816 | |||
ac47da3586 | |||
ef0ae8eef1 | |||
e6c3ffcdf7 | |||
4306039310 | |||
f3f6284698 | |||
a4c0b38fda | |||
7b511bff4c | |||
8bf519b6ac | |||
5668fd068e | |||
877b201496 | |||
17f8ac4f70 | |||
8f00fc2643 | |||
951f8365df | |||
eb94a3d6b6 | |||
31caf10c98 | |||
87c89ea568 | |||
99f954a583 | |||
a5a296e2b6 | |||
8e086317fa | |||
18024b6648 | |||
890482a931 | |||
475d6aa39f | |||
9e0704d920 | |||
3e72393d8f | |||
40516ab469 | |||
3599d345ac | |||
8a47ac5e10 | |||
ec02f09240 | |||
7683040fe8 | |||
845912dd49 | |||
04619a2063 | |||
af61f7a952 | |||
c9162bf4ff | |||
2a331564af | |||
0247b915b4 | |||
dd197fed1a | |||
7b88b9cea3 | |||
54cc80f649 | |||
b8f81502b8 | |||
e8e05159c1 | |||
49a6c39c38 | |||
706752d6b9 | |||
1e68ac7312 | |||
6761b3fcaf | |||
71d1084be2 | |||
f65deb727a | |||
d07f592306 | |||
cad0bd8c48 |
@ -6,6 +6,7 @@
|
||||
#include "fs/MBR.h"
|
||||
#include "memory/MemoryManager.h"
|
||||
#include <luna/Alignment.h>
|
||||
#include <luna/Buffer.h>
|
||||
#include <luna/CType.h>
|
||||
#include <luna/SafeArithmetic.h>
|
||||
#include <luna/Vector.h>
|
||||
@ -758,9 +759,7 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
|
||||
|
||||
ScopedKMutexLock<100> lock(m_drive->channel()->lock());
|
||||
|
||||
// FIXME: Don't always allocate this if we don't need it.
|
||||
auto* temp = (u8*)TRY(malloc_impl(block_size));
|
||||
auto guard = make_scope_guard([temp] { free_impl(temp); });
|
||||
Buffer temp;
|
||||
|
||||
if (offset % block_size)
|
||||
{
|
||||
@ -769,8 +768,10 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
|
||||
// Maybe we don't even want enough to get to the next block?
|
||||
if (extra_size > size) extra_size = size;
|
||||
|
||||
TRY(m_drive->read_lba(offset / block_size, temp, 1));
|
||||
memcpy(buf, temp + (offset % block_size), extra_size);
|
||||
TRY(temp.try_resize(block_size));
|
||||
|
||||
TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
|
||||
memcpy(buf, temp.data() + (offset % block_size), extra_size);
|
||||
offset += extra_size;
|
||||
size -= extra_size;
|
||||
buf += extra_size;
|
||||
@ -794,8 +795,9 @@ Result<u64> ATADevice::read(u8* buf, usize offset, usize size) const
|
||||
|
||||
if (size)
|
||||
{
|
||||
TRY(m_drive->read_lba(offset / block_size, temp, 1));
|
||||
memcpy(buf, temp, size);
|
||||
TRY(temp.try_resize(block_size));
|
||||
TRY(m_drive->read_lba(offset / block_size, temp.data(), 1));
|
||||
memcpy(buf, temp.data(), size);
|
||||
}
|
||||
|
||||
return length;
|
||||
|
@ -66,6 +66,9 @@ namespace GPT
|
||||
{
|
||||
header.checksum = 0;
|
||||
|
||||
return CRC32::checksum((u8*)&header, 0x5c);
|
||||
CRC32 crc;
|
||||
crc.append((u8*)&header, 0x5c);
|
||||
|
||||
return crc.digest();
|
||||
}
|
||||
}
|
||||
|
@ -44,7 +44,11 @@ Result<usize> Pipe::read(u8* buf, usize, usize length)
|
||||
|
||||
Result<usize> Pipe::write(const u8* buf, usize, usize length)
|
||||
{
|
||||
if (!m_reader) return length;
|
||||
if (!m_reader)
|
||||
{
|
||||
Scheduler::current()->send_signal(SIGPIPE);
|
||||
return err(EPIPE);
|
||||
}
|
||||
|
||||
u8* slice = TRY(m_data_buffer.slice_at_end(length));
|
||||
memcpy(slice, buf, length);
|
||||
|
@ -63,7 +63,7 @@ namespace Ext2
|
||||
|
||||
#ifdef EXT2_DEBUG
|
||||
kdbgln("ext2: Read inode %lu with mode %#x (%#x + %#o), size %lu", inum, inode->m_raw_inode.mode,
|
||||
inode->m_raw_inode.mode & 0xf000, inode->mode(), inode->size());
|
||||
inode->m_raw_inode.mode & 0xf000, inode->metadata().mode, inode->metadata().size);
|
||||
#endif
|
||||
|
||||
m_inode_cache.try_set(inum, inode);
|
||||
|
@ -91,19 +91,18 @@ namespace Ext2
|
||||
const usize inode_size = m_metadata.size;
|
||||
const usize block_size = m_fs->m_block_size;
|
||||
|
||||
u8* const buf = (u8*)TRY(calloc_impl(block_size, 1));
|
||||
auto guard = make_scope_guard([buf] { free_impl(buf); });
|
||||
auto buf = TRY(Buffer::create_sized(block_size));
|
||||
|
||||
m_entries.clear();
|
||||
|
||||
for (usize offset = 0; offset < inode_size; offset += block_size)
|
||||
{
|
||||
TRY(read(buf, offset, block_size));
|
||||
TRY(read(buf.data(), offset, block_size));
|
||||
|
||||
usize dir_offset = 0;
|
||||
while (dir_offset < block_size)
|
||||
{
|
||||
auto& entry = *(Ext2::RawDirectoryEntry*)&buf[dir_offset];
|
||||
auto& entry = *(Ext2::RawDirectoryEntry*)&buf.data()[dir_offset];
|
||||
|
||||
if (entry.inum != 0)
|
||||
{
|
||||
|
@ -182,7 +182,7 @@ Result<u64> sys_fork(Registers* regs, SyscallArgs)
|
||||
Scheduler::add_thread(thread);
|
||||
|
||||
#ifdef FORK_DEBUG
|
||||
kdbgln("fork: thread %lu forked into child %lu", current->id, thread->id);
|
||||
kdbgln("fork: thread %d forked into child %d", current->id, thread->id);
|
||||
#endif
|
||||
|
||||
return thread->id;
|
||||
|
@ -183,7 +183,7 @@ namespace Scheduler
|
||||
CPU::disable_interrupts();
|
||||
|
||||
#ifdef REAP_DEBUG
|
||||
kdbgln("reap: reaping thread with id %zu", thread->id);
|
||||
kdbgln("reap: reaping thread with id %d", thread->id);
|
||||
#endif
|
||||
|
||||
if (thread->is_kernel)
|
||||
|
@ -27,6 +27,7 @@ typedef struct
|
||||
int mode; // The buffering mode.
|
||||
} _buf;
|
||||
int _flags; // The file access mode with which the file was opened.
|
||||
pid_t _pid; // For popen(3) files, the pid of the child process.
|
||||
} FILE;
|
||||
|
||||
#define EOF -1
|
||||
@ -52,6 +53,7 @@ extern "C"
|
||||
{
|
||||
#endif
|
||||
|
||||
/* Flush a stream's buffers. */
|
||||
int fflush(FILE*);
|
||||
|
||||
/* Open a file and bind a stream to it. */
|
||||
@ -201,6 +203,9 @@ extern "C"
|
||||
/* Move a file's location across a file system. */
|
||||
int rename(const char* oldpath, const char* newpath);
|
||||
|
||||
/* Pipe a stream to or from a process. */
|
||||
FILE* popen(const char* command, const char* type);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
@ -6,6 +6,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <sys/syscall.h>
|
||||
#include <sys/wait.h>
|
||||
#include <unistd.h>
|
||||
|
||||
FILE* stdin = nullptr;
|
||||
@ -761,4 +762,87 @@ extern "C"
|
||||
unlink(oldpath);
|
||||
return 0;
|
||||
}
|
||||
|
||||
FILE* popen(const char* command, const char* type)
|
||||
{
|
||||
int pfds[2];
|
||||
if (pipe(pfds) < 0) return nullptr;
|
||||
|
||||
if (*type != 'r' && *type != 'w')
|
||||
{
|
||||
errno = EINVAL;
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
pid_t child = fork();
|
||||
if (child < 0)
|
||||
{
|
||||
close(pfds[0]);
|
||||
close(pfds[1]);
|
||||
return nullptr;
|
||||
}
|
||||
if (child == 0)
|
||||
{
|
||||
if (*type == 'r')
|
||||
{
|
||||
close(pfds[0]);
|
||||
dup2(pfds[1], STDOUT_FILENO);
|
||||
}
|
||||
else
|
||||
{
|
||||
close(pfds[1]);
|
||||
dup2(pfds[0], STDIN_FILENO);
|
||||
}
|
||||
|
||||
execl("/bin/sh", "sh", "-c", command, nullptr);
|
||||
_exit(127);
|
||||
}
|
||||
|
||||
int fd;
|
||||
if (*type == 'r')
|
||||
{
|
||||
close(pfds[1]);
|
||||
fd = pfds[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
close(pfds[0]);
|
||||
fd = pfds[1];
|
||||
}
|
||||
|
||||
int err = errno;
|
||||
FILE* f = (FILE*)malloc(sizeof(FILE));
|
||||
if (!f)
|
||||
{
|
||||
errno = err;
|
||||
close(fd);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
f->_fd = fd;
|
||||
f->_pid = child;
|
||||
clearerr(f);
|
||||
|
||||
f->_flags = *type == 'r' ? O_RDONLY : O_WRONLY;
|
||||
f->_buf.status = 0;
|
||||
f->_buf.mode = _IOFBF;
|
||||
f->_buf.size = f->_buf.index = 0;
|
||||
f->_buf.buffer = nullptr;
|
||||
setvbuf(f, NULL, f->_buf.mode, 0);
|
||||
|
||||
s_open_files[fd] = f;
|
||||
|
||||
return f;
|
||||
}
|
||||
|
||||
int pclose(FILE* stream)
|
||||
{
|
||||
pid_t pid = stream->_pid;
|
||||
fclose(stream);
|
||||
|
||||
int status;
|
||||
if (waitpid(pid, &status, 0) < 0) return -1;
|
||||
|
||||
return status;
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,13 @@
|
||||
#pragma once
|
||||
#include <luna/Types.h>
|
||||
|
||||
namespace CRC32
|
||||
class CRC32
|
||||
{
|
||||
u32 checksum(const u8* data, usize size);
|
||||
}
|
||||
public:
|
||||
void append(const u8* data, usize size);
|
||||
|
||||
u32 digest();
|
||||
|
||||
private:
|
||||
u32 m_checksum = 0xffffffffu;
|
||||
};
|
||||
|
@ -33,18 +33,16 @@ static const u32 crc_table[] = {
|
||||
0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
|
||||
};
|
||||
|
||||
namespace CRC32
|
||||
void CRC32::append(const u8* data, usize size)
|
||||
{
|
||||
u32 checksum(const u8* data, usize size)
|
||||
{
|
||||
u32 crc = 0xffffffffu;
|
||||
|
||||
for (usize i = 0; i < size; i++)
|
||||
{
|
||||
const u32 index = (crc & 0xff) ^ data[i];
|
||||
crc = (crc >> 8) ^ (crc_table[index]);
|
||||
}
|
||||
|
||||
return ~crc;
|
||||
const u32 index = (m_checksum & 0xff) ^ data[i];
|
||||
m_checksum = (m_checksum >> 8) ^ (crc_table[index]);
|
||||
}
|
||||
}
|
||||
|
||||
u32 CRC32::digest()
|
||||
{
|
||||
return ~m_checksum;
|
||||
}
|
||||
|
@ -5,7 +5,7 @@ export LUNA_BASE=${LUNA_BASE:-$LUNA_ROOT/base}
|
||||
[ -f "$LUNA_ROOT/env-local.sh" ] && source $LUNA_ROOT/env-local.sh
|
||||
|
||||
export LUNA_ARCH=${LUNA_ARCH:-x86_64}
|
||||
export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/tools/exec/:$PATH
|
||||
export PATH=$LUNA_ROOT/toolchain/$LUNA_ARCH-luna/bin:$LUNA_ROOT/toolchain/dist:$LUNA_ROOT/toolchain/bin:$LUNA_ROOT/tools/exec/:$PATH
|
||||
|
||||
if [ "$USE_MAKE" = "1" ]
|
||||
then
|
||||
|
40
tools/setup-autoconf.sh
Executable file
40
tools/setup-autoconf.sh
Executable file
@ -0,0 +1,40 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
source $(dirname $0)/setup-env.sh
|
||||
|
||||
cd $LUNA_ROOT
|
||||
|
||||
# libstdc++ needs autoconf (precisely version 2.69) so if the user has an older/more recent version, we must build autoconf from source.
|
||||
|
||||
export AUTOCONF_VERSION=2.69
|
||||
|
||||
mkdir -p toolchain/tarballs
|
||||
mkdir -p toolchain/build
|
||||
|
||||
if [ ! -f toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz ]; then
|
||||
echo "Downloading autoconf (precisely version 2.69)..."
|
||||
|
||||
wget -Otoolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz https://ftp.gnu.org/gnu/autoconf/autoconf-$AUTOCONF_VERSION.tar.gz
|
||||
fi
|
||||
|
||||
rm -rf toolchain/build/build-autoconf
|
||||
rm -rf toolchain/build/autoconf-$AUTOCONF_VERSION
|
||||
|
||||
echo "Extracting autoconf (precisely version 2.69)..."
|
||||
|
||||
tar xf toolchain/tarballs/autoconf-$AUTOCONF_VERSION.tar.gz -C toolchain/build/
|
||||
|
||||
mkdir -p toolchain/build/build-autoconf
|
||||
|
||||
cd toolchain/build/build-autoconf
|
||||
|
||||
unset CC
|
||||
unset CXX
|
||||
unset LD
|
||||
unset AR
|
||||
|
||||
echo "Building autoconf (precisely version 2.69)..."
|
||||
|
||||
../autoconf-$AUTOCONF_VERSION/configure --prefix=$LUNA_ROOT/toolchain
|
||||
make
|
||||
make install
|
@ -36,6 +36,10 @@ patch -u -i $LUNA_ROOT/tools/gcc.patch -p 1 -d build
|
||||
|
||||
cd -
|
||||
|
||||
cd toolchain/build/gcc-$LUNA_GCC_VERSION_REQUIRED/libstdc++-v3
|
||||
autoconf
|
||||
cd -
|
||||
|
||||
echo Configuring GCC...
|
||||
|
||||
mkdir -p toolchain/build/gcc-$LUNA_ARCH
|
||||
|
@ -9,6 +9,12 @@ fi
|
||||
|
||||
if ! $(dirname $0)/test-gcc.sh
|
||||
then
|
||||
if ! $(dirname $0)/test-autoconf.sh
|
||||
then
|
||||
echo Building autoconf...
|
||||
$(dirname $0)/setup-autoconf.sh
|
||||
fi
|
||||
|
||||
echo Building GCC..
|
||||
$(dirname $0)/setup-gcc.sh
|
||||
fi
|
||||
|
16
tools/test-autoconf.sh
Executable file
16
tools/test-autoconf.sh
Executable file
@ -0,0 +1,16 @@
|
||||
#!/usr/bin/env bash
|
||||
set -e
|
||||
source $(dirname $0)/setup-env.sh
|
||||
|
||||
if [ -x "$(command -v autoconf)" ]
|
||||
then
|
||||
if [ "$(autoconf --version | head -n 1 | awk '{ print $4 }')" == "2.69" ]
|
||||
then
|
||||
exit 0
|
||||
else
|
||||
echo "You have autoconf installed, but it is not version 2.69, which is required by libstdc++. Thus, we must build autoconf from source."
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
exit 1
|
||||
fi
|
Loading…
Reference in New Issue
Block a user