ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-20 17:52:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

hw: fix build errors with -std=gnu++20

Browse Source 
Fix genodelabs/genode#4894
This commit is contained in:
Stefan Kalkowski 2023-05-16 13:29:31 +02:00 committed by Christian Helmuth
parent 87bed28ef8
commit 90690d96d4
16 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repos/base-hw/src/bootstrap/board/virt_qemu_arm_v7a/board.h
View File

@ -28,7 +28,7 @@ namespace Board {
using Pic = Hw::Gicv2;
static constexpr bool NON_SECURE = true;
enum { NR_OF_CPUS = 2 };
static constexpr Genode::size_t NR_OF_CPUS = 2;
};
#endif /* _SRC__BOOTSTRAP__SPEC__VIRT__QEMU_H_ */

2
repos/base-hw/src/bootstrap/board/virt_qemu_arm_v8a/board.h
View File

@ -31,7 +31,7 @@ namespace Board {
static void wake_up_all_cpus(void*);
};
enum { NR_OF_CPUS = 4 };
static constexpr Genode::size_t NR_OF_CPUS = 4;
using Hw::Pic;
};

2
repos/base-hw/src/bootstrap/spec/arm/cortex_a9_mmu.cc
View File

@ -42,7 +42,7 @@ class Cpu_counter
{
while (!Genode::cmpxchg((volatile int*)&_locked, UNLOCKED, LOCKED))
;
_counter++;
_counter = _counter + 1;
Genode::memory_barrier();
_locked = UNLOCKED;
}

3
repos/base-hw/src/core/board/virt_qemu_arm_v7a/board.h
View File

@ -35,8 +35,9 @@ namespace Board {
VT_TIMER_IRQ = 27,
VT_MAINTAINANCE_IRQ = 25,
VCPU_MAX = 16,
NR_OF_CPUS = 2,
};
static constexpr Genode::size_t NR_OF_CPUS = 2;
};
#endif /* _SRC__CORE__SPEC__VIRT__QEMU_H_ */

3
repos/base-hw/src/core/board/virt_qemu_arm_v8a/board.h
View File

@ -27,8 +27,9 @@ namespace Board {
using namespace Hw::Virt_qemu_board;
static constexpr Genode::size_t NR_OF_CPUS = 4;
enum {
NR_OF_CPUS = 4,
TIMER_IRQ = 30, /* PPI IRQ 14 */
VT_TIMER_IRQ = 11 + 16,
VT_MAINTAINANCE_IRQ = 9 + 16,

3
repos/base-hw/src/core/kernel/cpu.h
View File

@ -145,7 +145,8 @@ class Kernel::Cpu : public Core::Cpu, private Irq::Pool, private Timeout
State state() { return _state; }
enum { KERNEL_STACK_SIZE = 16 * 1024 * sizeof(Genode::addr_t) };
static constexpr size_t KERNEL_STACK_SIZE =
16 * 1024 * sizeof(Genode::addr_t);
/**
* Construct object for CPU 'id'

4
repos/base-hw/src/core/kernel/main.cc
View File

@ -138,7 +138,7 @@ void Kernel::main_initialize_and_handle_kernel_entry()
Main::_instance->_global_irq_ctrl.init();
}
nr_of_initialized_cpus ++;
nr_of_initialized_cpus = nr_of_initialized_cpus + 1;
Main::_instance->_cpu_pool.cpu(Cpu::executing_id()).reinit_cpu();
@ -168,7 +168,7 @@ void Kernel::main_initialize_and_handle_kernel_entry()
Main::_instance->_core_platform_pd.kernel_pd(),
Main::_instance->_global_irq_ctrl);
nr_of_initialized_cpus++;
nr_of_initialized_cpus = nr_of_initialized_cpus + 1;
};
/**

3
repos/base-hw/src/include/hw/spec/arm/imx53_qsb_board.h
View File

@ -26,8 +26,9 @@ namespace Hw::Imx53_qsb_board {
enum {
UART_BASE = UART_1_MMIO_BASE,
UART_CLOCK = 0, /* ignored value */
NR_OF_CPUS = 1,
};
static constexpr Genode::size_t NR_OF_CPUS = 1;
}
#endif /* _SRC__INCLUDE__HW__SPEC__IMX53_QSB_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/imx6q_sabrelite_board.h
View File

@ -31,8 +31,9 @@ namespace Hw::Imx6q_sabrelite_board {
UART_BASE = UART_2_MMIO_BASE,
UART_SIZE = UART_2_MMIO_SIZE,
UART_CLOCK = 0, /* dummy value, not used */
NR_OF_CPUS = 4
};
static constexpr Genode::size_t NR_OF_CPUS = 4;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__IMX6Q_SABRELITE_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/imx7d_sabre_board.h
View File

@ -29,8 +29,9 @@ namespace Hw::Imx7d_sabre_board {
enum {
UART_BASE = UART_1_MMIO_BASE,
UART_CLOCK = 0, /* unsued value */
NR_OF_CPUS = 2
};
static constexpr Genode::size_t NR_OF_CPUS = 2;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__IMX7_SABRELITE_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/nit6_solox_board.h
View File

@ -31,8 +31,9 @@ namespace Hw::Nit6_solox_board {
UART_BASE = UART_1_MMIO_BASE,
UART_SIZE = UART_1_MMIO_SIZE,
UART_CLOCK = 0, /* dummy value, not used */
NR_OF_CPUS = 1
};
static constexpr Genode::size_t NR_OF_CPUS = 1;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__NIT6_SOLOX_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/pbxa9_board.h
View File

@ -31,8 +31,9 @@ namespace Hw::Pbxa9_board {
enum {
UART_BASE = PL011_0_MMIO_BASE,
UART_CLOCK = PL011_0_CLOCK,
NR_OF_CPUS = 1,
};
static constexpr Genode::size_t NR_OF_CPUS = 1;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__PBXA9_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/usb_armory_board.h
View File

@ -27,8 +27,9 @@ namespace Hw::Usb_armory_board {
enum {
UART_BASE = UART_1_MMIO_BASE,
UART_CLOCK = 0, /* ignored value */
NR_OF_CPUS = 1,
};
static constexpr Genode::size_t NR_OF_CPUS = 1;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__USB_ARMORY_BOARD_H_ */

3
repos/base-hw/src/include/hw/spec/arm/wand_quad_board.h
View File

@ -31,8 +31,9 @@ namespace Hw::Wand_quad_board {
UART_BASE = UART_1_MMIO_BASE,
UART_SIZE = UART_1_MMIO_SIZE,
UART_CLOCK = 0, /* dummy value, not used */
NR_OF_CPUS = 4
};
static constexpr Genode::size_t NR_OF_CPUS = 4;
}
#endif /* _SRC__INCLUDE__HW__SPEC__ARM__WAND_QUAD_BOARD_H_ */

2
repos/base-hw/src/include/hw/spec/x86_64/pc_board.h
View File

@ -24,7 +24,7 @@ namespace Hw::Pc_board {
struct Serial;
enum Dummies { UART_BASE, UART_CLOCK };
enum { NR_OF_CPUS = 32 };
static constexpr Genode::size_t NR_OF_CPUS = 32;
}

2
repos/base-hw/src/test/cpu_quota/main.cc
View File

@ -77,7 +77,7 @@ class Counter : public Thread
_start_measurement.receive();
_stage = MEASUREMENT;
_synchronizer.synchronize();
while (_stage == MEASUREMENT) { value++; }
while (_stage == MEASUREMENT) { value = value + 1; }
}
_value = value;
_start_destruction.submit();