Skip to content
Snippets Groups Projects
Commit 1ae6c3a3 authored by John Hodge's avatar John Hodge
Browse files

ALL - Compilation fixes after some bitrotting

parent d96f4148
No related merge requests found
...@@ -33,11 +33,18 @@ CPPFLAGS += -I $(ACPICAROOT)source/include -D _ACESS -D __KERNEL__ ...@@ -33,11 +33,18 @@ CPPFLAGS += -I $(ACPICAROOT)source/include -D _ACESS -D __KERNEL__
CPPFLAGS += -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1 CPPFLAGS += -D ARCH=$(ARCH) -D ARCHDIR=$(ARCHDIR) -D PLATFORM=\"$(PLATFORM)\" -D ARCHDIR_IS_$(ARCHDIR)=1 -D PLATFORM_is_$(PLATFORM)=1
CPPFLAGS += -D KERNEL_VERSION=$(KERNEL_VERSION) -ffreestanding CPPFLAGS += -D KERNEL_VERSION=$(KERNEL_VERSION) -ffreestanding
ifneq ($(ACPI_DEBUG),no) ifneq ($(ACPI_DEBUG),no)
CPPFLAGS += -D ACPI_DEBUG_OUTPUT=1 -D ACPI_DISASSEMBLER=1 CPPFLAGS += -D ACPI_DEBUG_OUTPUT=1
#CPPFLAGS += -D ACPI_DEBUGGER=1
CPPFLAGS += -D ACPI_DISASSEMBLER=1
endif endif
CFLAGS += -Wall -fno-stack-protector -Wstrict-prototypes -std=gnu99 -g CFLAGS += -Wall -fno-stack-protector -Wstrict-prototypes -std=gnu99 -g
SRCS := $(wildcard $(COMPDIR)*/*.c) SRCS := $(wildcard $(COMPDIR)*/*.c)
SRCS := $(filter-out $(COMPDIR)debugger/%,$(SRCS))
ifeq ($(ACPI_DEBUG),no)
SRCS := $(filter-out $(COMPDIR)disassembler/%,$(SRCS))
SRCS := $(filter-out %/resources/rsdump.c,$(SRCS))
endif
OBJS := $(SRCS:$(COMPDIR)%.c=obj-$(ARCH)/%.o) OBJS := $(SRCS:$(COMPDIR)%.c=obj-$(ARCH)/%.o)
ACENV_H := $(ACPICAROOT)source/include/platform/acenv.h ACENV_H := $(ACPICAROOT)source/include/platform/acenv.h
......
--- bfd/config.bfd 2011-07-29 00:00:00.000000 +0000 --- bfd/config.bfd 2011-07-29 00:00:00.000000 +0000
+++ bfd/config.bfd 2013-03-01 10:45:00.000000 +0800 +++ bfd/config.bfd 2013-03-01 10:45:00.000000 +0800
@@ -1576,2 +1576,15 @@ @@ -1712,3 +1712,16 @@
;; ;;
+ i[3-7]86-*-acess2) + i[3-7]86-*-acess2)
+ targ_defvec=bfd_elf32_i386_vec + targ_defvec=i386_elf32_vec
+ targ_selvecs="bfd_elf32_i386_vec i386coff_vec" + targ_selvecs="i386_elf32_vec i386_coff_vec"
+ ;; + ;;
+ x86_64-*-acess2) + x86_64-*-acess2)
+ targ_defvec=bfd_elf64_x86_64_vec + targ_defvec=bfd_elf64_x86_64_vec
+ targ_selvecs="bfd_elf32_i386_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec" + targ_selvecs="i386_elf32_vec bfd_elf32_x86_64_vec i386linux_vec i386pei_vec x86_64pei_vec bfd_elf64_l1om_vec bfd_elf64_k1om_vec"
+ want64=true + want64=true
+ ;; + ;;
+ arm-*-acess2) + arm-*-acess2)
...@@ -16,3 +16,4 @@ ...@@ -16,3 +16,4 @@
+ targ_selvecs="bfd_elf32_bigarm_vec" + targ_selvecs="bfd_elf32_bigarm_vec"
+ ;; + ;;
# END OF targmatch.h # END OF targmatch.h
*)
--- config.sub --- config.sub
+++ config.sub +++ config.sub
@@ -1336,1 +1336,2 @@ @@ -1379,4 +1379,5 @@
| -aos* | -aros* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
+ | -acess2* \ + | -acess2* \
| -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
...@@ -31,7 +31,7 @@ int ACPICA_Initialise(void) ...@@ -31,7 +31,7 @@ int ACPICA_Initialise(void)
ACPI_STATUS rv; ACPI_STATUS rv;
#ifdef ACPI_DEBUG_OUTPUT #ifdef ACPI_DEBUG_OUTPUT
AcpiDbgLevel = ACPI_DB_ALL; AcpiDbgLevel = ACPI_LV_ALL;
#endif #endif
rv = AcpiInitializeSubsystem(); rv = AcpiInitializeSubsystem();
...@@ -83,7 +83,7 @@ ACPI_STATUS AcpiOsTerminate(void) ...@@ -83,7 +83,7 @@ ACPI_STATUS AcpiOsTerminate(void)
ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void) ACPI_PHYSICAL_ADDRESS AcpiOsGetRootPointer(void)
{ {
ACPI_SIZE val; ACPI_PHYSICAL_ADDRESS val;
ACPI_STATUS rv; ACPI_STATUS rv;
if( gACPI_RSDPOverride ) if( gACPI_RSDPOverride )
...@@ -238,7 +238,7 @@ void *AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length) ...@@ -238,7 +238,7 @@ void *AcpiOsMapMemory(ACPI_PHYSICAL_ADDRESS PhysicalAddress, ACPI_SIZE Length)
{ {
if( PhysicalAddress < ONEMEG ) { if( PhysicalAddress < ONEMEG ) {
ASSERTCR(Length, <=, ONEMEG-PhysicalAddress, NULL); ASSERTCR(Length, <=, ONEMEG-PhysicalAddress, NULL);
return (void*)(KERNEL_BASE | PhysicalAddress); return (void*)(KERNEL_BASE | (uintptr_t)(PhysicalAddress));
} }
Uint ofs = PhysicalAddress & (PAGE_SIZE-1); Uint ofs = PhysicalAddress & (PAGE_SIZE-1);
...@@ -518,10 +518,10 @@ ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT3 ...@@ -518,10 +518,10 @@ ACPI_STATUS AcpiOsReadMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 *Value, UINT3
{ {
void *ptr; void *ptr;
if( Address < ONEMEG ) { if( Address < ONEMEG ) {
ptr = (void*)(KERNEL_BASE | Address); ptr = (void*)(KERNEL_BASE | (uintptr_t)Address);
} }
else { else {
ptr = (char*)MM_MapTemp(Address) + (Address & 0xFFF); ptr = (char*)MM_MapTemp(Address) + ((uintptr_t)Address & 0xFFF);
} }
switch(Width) switch(Width)
...@@ -545,7 +545,7 @@ ACPI_STATUS AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 Value, UINT3 ...@@ -545,7 +545,7 @@ ACPI_STATUS AcpiOsWriteMemory(ACPI_PHYSICAL_ADDRESS Address, UINT64 Value, UINT3
{ {
void *ptr; void *ptr;
if( Address < ONEMEG ) { if( Address < ONEMEG ) {
ptr = (void*)(KERNEL_BASE | Address); ptr = (void*)(KERNEL_BASE | (uintptr_t)Address);
} }
else { else {
ptr = (char*)MM_MapTemp(Address) + (Address & 0xFFF); ptr = (char*)MM_MapTemp(Address) + (Address & 0xFFF);
......
...@@ -572,13 +572,13 @@ int AHCI_DoFIS(tAHCI_Port *Port, int bWrite, ...@@ -572,13 +572,13 @@ int AHCI_DoFIS(tAHCI_Port *Port, int bWrite,
while( ofs < OutSize ) while( ofs < OutSize )
{ {
tPAddr phys = MM_GetPhysAddr( (char*)OutData + ofs ); tPAddr phys = MM_GetPhysAddr( (char*)OutData + ofs );
ASSERT( !(phys & 3) );
// TODO: must be 4 byte aligned, and handle 64-bit addressing
size_t len = MIN(OutSize - ofs, PAGE_SIZE - (phys % PAGE_SIZE)); size_t len = MIN(OutSize - ofs, PAGE_SIZE - (phys % PAGE_SIZE));
// TODO: must be 4 byte aligned, and handle 64-bit addressing
ASSERT( !(phys & 3) );
// TODO: count must be even, and not more than 4MB
ASSERT( !(len & 1) ); ASSERT( !(len & 1) );
ASSERT( len < 4*1024*1024 ); ASSERT( len < 4*1024*1024 );
LOG("PRDTL[%i] = %P+%i", prdtl, phys, len); LOG("PRDTL[%i] = %P+%i", prdtl, phys, len);
// TODO: count must be even.
AHCI_int_SetAddr(Port->Ctrlr, &cmdt->PRDT[prdtl].DBA, phys); AHCI_int_SetAddr(Port->Ctrlr, &cmdt->PRDT[prdtl].DBA, phys);
cmdt->PRDT[prdtl].DBC = len-1; cmdt->PRDT[prdtl].DBC = len-1;
prdtl ++; prdtl ++;
......
...@@ -13,7 +13,7 @@ LIBS += -lc++ ...@@ -13,7 +13,7 @@ LIBS += -lc++
include ../Makefile.tpl include ../Makefile.tpl
%.native: %.cpp %.native: %.cpp
$(NCXX) $< -o $@ -Wall -std=c++11 -I include_exp/ $(NCXX) $< -o $@ -Wall -std=c++14 -O3 -I include_exp/
TEST_cprintf.native: include_exp/cxxextras_printf TEST_cprintf.native: include_exp/cxxextras_printf
...@@ -238,7 +238,8 @@ namespace _printf ...@@ -238,7 +238,8 @@ namespace _printf
constexpr bool val_fmt_prec_arg(const char *fmt, PrintfFlags item) constexpr bool val_fmt_prec_arg(const char *fmt, PrintfFlags item)
{ {
//static_assert(false, "Too few arguments when getting precision modifier"); //static_assert(false, "Too few arguments when getting precision modifier");
return false ? false : throw "Too few arguments when getting precision modifier"; //return false ? false : throw "Too few arguments when getting precision modifier";
return false;
} }
template <typename ...Args> template <typename ...Args>
constexpr bool val_fmt_prec(const char * fmt, PrintfFlags item, Args... args) constexpr bool val_fmt_prec(const char * fmt, PrintfFlags item, Args... args)
...@@ -274,7 +275,8 @@ namespace _printf ...@@ -274,7 +275,8 @@ namespace _printf
constexpr bool val_fmt_width_arg(const char *fmt, PrintfFlags item) constexpr bool val_fmt_width_arg(const char *fmt, PrintfFlags item)
{ {
//static_assert(false, "Too few arguments when reading width for width modifier"); //static_assert(false, "Too few arguments when reading width for width modifier");
return false ? false : throw "Too few arguments when reading width for width modifier"; //return false ? false : throw "Too few arguments when reading width for width modifier";
return false;
} }
template <typename ...Args> template <typename ...Args>
constexpr bool val_fmt_width(const char * fmt, PrintfFlags item, Args... args) constexpr bool val_fmt_width(const char * fmt, PrintfFlags item, Args... args)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment