Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions BaseHdr/Hal/x86_64_gdt.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,11 @@
#define __X86_64_GDT_H__

#include <stdint.h>
#if defined(__GNUC__) || defined(__clang__)
#ifndef __cplusplus
#include <stddef.h>
#endif
#endif

#define GDT_ENTRY_NULL 0
#define GDT_ENTRY_KERNEL_CODE 1
Expand Down
4 changes: 4 additions & 0 deletions BaseHdr/timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@
#define __TIMER_H__

#include <aurora.h>
#ifdef ARCH_X64
#include <Hal/x86_64_sched.h>
#elif ARCH_ARM64
#include <Hal/AA64/sched.h>
#endif
#if defined(__GNUC__) || defined(__clang__)
#ifndef __cplusplus
#include <stdbool.h>
Expand Down
2 changes: 1 addition & 1 deletion Boot/xnldr.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ EFI_STATUS efi_main_handler(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE* SystemTabl
*-------------------------------------------------------------------
*/
void* xdsp_address = NULL;
#ifdef __MSC_VER
#ifdef _MSC_VER
static EFI_GUID acpi_guid = EFI_ACPI_20_TABLE_GUID;
#else
static EFI_GUID acpi_guid = ACPI_20_TABLE_GUID;
Expand Down
3 changes: 2 additions & 1 deletion BootAA64/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Target EFI binary
.DEFAULT_GOAL := all
TARGET_EFI = BOOTAA64.efi
TARGET_SO = BOOTAA64.so

Expand Down Expand Up @@ -84,7 +85,7 @@ $(EFI_OUTPUT): $(OBJS)
else
# Original GCC compilation
$(SO_OUTPUT): $(CRT0) $(OBJS)
$(LD) -nostdlib --warn-common --no-undefined --build-id=sha1 -z noexecstack -z max-page-size=4096 \
$(LD) -nostdlib --warn-common --no-undefined --build-id=sha1 -z muldefs -z noexecstack -z max-page-size=4096 \
-shared -Bsymbolic $(LIBDIRS) -T$(LDSCRIPT) $(CRT0) $(OBJS) -o $@ $(LIBS)

$(EFI_OUTPUT): $(SO_OUTPUT)
Expand Down
4 changes: 4 additions & 0 deletions BootAA64/xnldr.h
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@

#include <stdint.h>
#include <Uefi.h>
#if defined(__GNUC__) || defined(__clang__)
#ifndef __cplusplus
#include <stddef.h>
#endif
#endif
#ifndef SIZE_MAX
#if defined(ARCH_ARM64) || defined(ARCH_X64) || defined(_M_AMD64) || defined(_M_ARM64) || defined(__x86_64__) || defined(__aarch64__)
#define SIZE_MAX 0xFFFFFFFFFFFFFFFFULL
Expand Down
2 changes: 1 addition & 1 deletion Kernel/Hal/serial.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ void DebugSerial(char* string) {
*/
AU_EXTERN AU_EXPORT void SeTextOut(char* format, ...) {

_va_list_ args;
va_list args;
va_start(args, format);

while (*format)
Expand Down
4 changes: 4 additions & 0 deletions Kernel/_CRT.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,11 @@


#include <stdint.h>
#if defined(__GNUC__) || defined(__clang__)
#ifndef __cplusplus
#include <stddef.h>
#endif
#endif

extern "C" int _fltused = 1;

Expand Down
2 changes: 1 addition & 1 deletion Kernel/process.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ int AuProcessWaitForTermination(AuProcess *proc, int pid) {
else {
AuProcess* proc = AuProcessFindByPID(0,pid);
if (!proc)
return;
return -1;
AuThread* thr = AuGetCurrentThread();
AuBlockThread(thr);
list_add(proc->waitlist, thr);
Expand Down
1 change: 1 addition & 0 deletions KernelAA64/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# XenevaOS KernelAA64 Makefile
.DEFAULT_GOAL := all

TARGET = KernelAA64.elf
OBJDIR = obj
Expand Down
1 change: 0 additions & 1 deletion KernelAA64/init.c
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@
#include <Fs/Fat/Fat.h>
#include <Fs/Fat/FatFile.h>
#include <Fs/Fat/FatDir.h>
#include <linux/bitops.h>

extern int _fltused = 1;
static bool _littleboot_used;
Expand Down
4 changes: 2 additions & 2 deletions KernelAA64/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ void AuProcessFreeKeResource(AA64Thread* thr) {
* @param proc -- process to exit
* @param schedulable -- schedule to next thread
*/
void AuProcessExit(AuProcess* proc, BOOL schedulable) {
void AuProcessExit(AuProcess* proc, bool schedulable) {
if (proc == root_proc) {
UARTDebugOut("[aurora]: cannot exit root process \r\n");
return;
Expand Down Expand Up @@ -515,7 +515,7 @@ int AuProcessWaitForTermination(AuProcess* proc, int pid) {
else {
AuProcess* proc = AuProcessFindByPID(0, pid);
if (!proc)
return;
return -1;
AA64Thread* thr = AuGetCurrentThread();
AuBlockThread(thr);
list_add(proc->waitlist, thr);
Expand Down
2 changes: 2 additions & 0 deletions Process/DeodhaiXR/alpha.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,10 @@
#include "deodxr.h"
#include "alpha.h"
#if defined(ARCH_ARM64)
#ifdef ARCH_ARM64
#include <arm_neon.h>
#endif
#endif
#include <math.h>
#include "window.h"
#include <stdlib.h>
Expand Down
2 changes: 2 additions & 0 deletions Process/DeodhaiXR/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@
#include "animation.h"
#include "alpha.h"
#include "nanojpg.h"
#ifdef ARCH_ARM64
#include <arm_neon.h>
#endif
#include "compose.h"
#include <sys/_ketime.h>

Expand Down
4 changes: 3 additions & 1 deletion Process/XELnch/rrect.cpp
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include <arm_neon.h>
#ifdef ARCH_ARM64
#include <arm_neon.h>
#endif
#include <stdint.h>
#include <chitralekha.h>

Expand Down
Loading