include: types: remove ulong_t (be384562) · Commits · Wenxi XU / zephyr

arch/mips/core/fatal.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@ FUNC_NORETURN void z_mips_fatal_error(unsigned int reason,
		CODE_UNREACHABLE;
		}

		static char *cause_str(ulong_t cause)
		static char *cause_str(unsigned long cause)
		{
		switch (cause) {
		case 0:
		@@ -86,7 +86,7 @@ static char *cause_str(ulong_t cause)

		void _Fault(z_arch_esf_t *esf)
		{
		ulong_t cause;
		unsigned long cause;

		cause = (read_c0_cause() & CAUSE_EXP_MASK) >> CAUSE_EXP_SHIFT;

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,7 +17,7 @@ uint32_t mips_cp0_status_int_mask;

		FUNC_NORETURN void z_irq_spurious(const void *unused)
		{
		ulong_t cause;
		unsigned long cause;

		ARG_UNUSED(unused);
		cause = (read_c0_cause() & CAUSE_EXP_MASK) >> CAUSE_EXP_SHIFT;

+6 −6

Original line number	Diff line number	Diff line
		@@ -27,15 +27,15 @@ void arch_new_thread(struct k_thread thread, k_thread_stack_t stack,
		);

		/* Setup the initial stack frame */
		stack_init->a0 = (ulong_t)entry;
		stack_init->a1 = (ulong_t)p1;
		stack_init->a2 = (ulong_t)p2;
		stack_init->a3 = (ulong_t)p3;
		stack_init->a0 = (unsigned long)entry;
		stack_init->a1 = (unsigned long)p1;
		stack_init->a2 = (unsigned long)p2;
		stack_init->a3 = (unsigned long)p3;

		stack_init->status = CP0_STATUS_DEF_RESTORE
		\| mips_cp0_status_int_mask;

		stack_init->epc = (ulong_t)z_thread_entry;
		stack_init->epc = (unsigned long)z_thread_entry;

		thread->callee_saved.sp = (ulong_t)stack_init;
		thread->callee_saved.sp = (unsigned long)stack_init;
		}

+6 −6

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ FUNC_NORETURN void z_riscv_fatal_error(unsigned int reason,
		CODE_UNREACHABLE;
		}

		static char *cause_str(ulong_t cause)
		static char *cause_str(unsigned long cause)
		{
		switch (cause) {
		case 0:
		@@ -148,22 +148,22 @@ void _Fault(z_arch_esf_t *esf)
		* treated as recoverable.
		*/
		for (int i = 0; i < ARRAY_SIZE(exceptions); i++) {
		ulong_t start = (ulong_t)exceptions[i].start;
		ulong_t end = (ulong_t)exceptions[i].end;
		unsigned long start = (unsigned long)exceptions[i].start;
		unsigned long end = (unsigned long)exceptions[i].end;

		if (esf->mepc >= start && esf->mepc < end) {
		esf->mepc = (ulong_t)exceptions[i].fixup;
		esf->mepc = (unsigned long)exceptions[i].fixup;
		return;
		}
		}
		#endif /* CONFIG_USERSPACE */

		ulong_t mcause;
		unsigned long mcause;

		__asm__ volatile("csrr %0, mcause" : "=r" (mcause));

		#ifndef CONFIG_SOC_OPENISA_RV32M1_RISCV32
		ulong_t mtval;
		unsigned long mtval;
		__asm__ volatile("csrr %0, mtval" : "=r" (mtval));
		#endif

+1 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,7 @@ LOG_MODULE_DECLARE(os, CONFIG_KERNEL_LOG_LEVEL);

		FUNC_NORETURN void z_irq_spurious(const void *unused)
		{
		ulong_t mcause;
		unsigned long mcause;

		ARG_UNUSED(unused);