xxq2506
/
xiuos3
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Remove useless codes, supplementary license and descriptions clearer

This commit is contained in:
Huang_Yuqing 2021-04-30 16:00:51 +08:00
parent 3ba05d0a71
commit bd275f2f2a
10 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
arch/arm/cortex-m4/boot.S
View File

@ -42,13 +42,24 @@
*/ */
/** /**
* @file coreclock.c * @file boot.S
* @brief derived from ST standard peripheral library * @brief derived from ST standard peripheral library
* @version 1.0 * @version 1.0
* @author AIIT XUOS Lab * @author AIIT XUOS Lab
* @date 2021-04-25 * @date 2021-04-25
*/ */
/*************************************************
File name: boot.S
Description: Reset and init function
Others:
History:
1. Date: 2021-04-29
Author: AIIT XUOS Lab
Modification:
1. take startup_stm32f407xx.s for XiUOS
*************************************************/
.syntax unified .syntax unified
.cpu cortex-m4 .cpu cortex-m4
.fpu softvfp .fpu softvfp

13
arch/arm/cortex-m4/interrupt_vector.S
View File

@ -42,13 +42,24 @@
*/ */
/** /**
* @file coreclock.c * @file interrupt_vector.S
* @brief derived from ST standard peripheral library * @brief derived from ST standard peripheral library
* @version 1.0 * @version 1.0
* @author AIIT XUOS Lab * @author AIIT XUOS Lab
* @date 2021-04-25 * @date 2021-04-25
*/ */
/*************************************************
File name: interrupt_vector.S
Description: Interrupt Vectors
Others:
History:
1. Date: 2021-04-29
Author: AIIT XUOS Lab
Modification:
1. take startup_stm32f407xx.s for XiUOS
*************************************************/
.globl InterruptVectors .globl InterruptVectors
/****************************************************************************** /******************************************************************************

1
arch/arm/cortex-m4/mpu.c
View File

@ -117,7 +117,6 @@ int8_t MpuAddRegion(void *task_mpu, x_base addr , size_t size , uint8_t type)
l2size = MpuLog2Ceil(size); l2size = MpuLog2Ceil(size);
addr = MPU_ALIGN(addr , 1 << l2size ); addr = MPU_ALIGN(addr , 1 << l2size );
// KPrintf( "region:%d , size : 0x%08x, l2size: %d , mpu_size : 0x%08x \n",region, size, l2size , MPU_RASR_REGION_SIZE(l2size) );
mpu->region[region].config.rasr = flag |MPU_RASR_REGION_SIZE(l2size) | MPU_ENABLE; mpu->region[region].config.rasr = flag |MPU_RASR_REGION_SIZE(l2size) | MPU_ENABLE;
mpu->region[region].config.rbar = addr | MPU_RBAR_VALID | region ; //rbar must set region number mpu->region[region].config.rbar = addr | MPU_RBAR_VALID | region ; //rbar must set region number

1
arch/arm/cortex-m4/mpu.h
View File

@ -26,7 +26,6 @@
#define MPU_MAX_REGION_NUM 8 #define MPU_MAX_REGION_NUM 8
#define MPU_SYS_REGION_RESERVER 8
/* MPU Control Register Bit Definitions */ /* MPU Control Register Bit Definitions */

1
arch/arm/cortex-m4/svc_entry.S
View File

@ -34,7 +34,6 @@ SVC_Entry:
MOVEQ r2, #0x01 MOVEQ r2, #0x01
STMFD r1!, {r2} STMFD r1!, {r2}
#endif #endif
//LDR sp, =__stack_tp
PUSH {lr} PUSH {lr}
BL Svcall /* R0=IRQ, R1=register save (msp) */ BL Svcall /* R0=IRQ, R1=register save (msp) */
POP {lr} POP {lr}

7
arch/arm/cortex-m4/svc_handle.c
View File

@ -21,7 +21,7 @@ static void SvcDispatch(void)
{ {
__asm__ __volatile__ __asm__ __volatile__
( (
" mov r12, sp\n" /* Calculate (orig_SP - new_SP) */ " mov r12, sp\n"
" sub r12, r12, #36\n" " sub r12, r12, #36\n"
" and r12, r12, #7\n" " and r12, r12, #7\n"
" add r12, r12, #36\n" " add r12, r12, #36\n"
@ -56,14 +56,11 @@ void _svcall(uintptr_t* contex)
switch (svc_number) { switch (svc_number) {
case 0: //svc handler case 0: //svc handler
tid->task_dync_sched_member.svc_return = contex[REG_INT_PC]; tid->task_dync_sched_member.svc_return = contex[REG_INT_PC];
//tid->task_dync_sched_member.exc_return = contex[REG_INT_EXC_RETURN];
tid->task_dync_sched_member.isolation_status = 1; tid->task_dync_sched_member.isolation_status = 1;
contex[REG_INT_PC] = (uint32_t)SvcDispatch & ~1; contex[REG_INT_PC] = (uint32_t)SvcDispatch & ~1;
//contex[REG_INT_EXC_RETURN] = EXC_RETURN_PRIVTHR;
break; break;
case 1: // svc return case 1: // svc return
contex[REG_INT_PC] = tid->task_dync_sched_member.svc_return; contex[REG_INT_PC] = tid->task_dync_sched_member.svc_return;
//contex[REG_INT_EXC_RETURN] = tid->task_dync_sched_member.exc_return;
tid->task_dync_sched_member.isolation_status = 0; tid->task_dync_sched_member.isolation_status = 0;
break; break;
default: default:
@ -76,7 +73,6 @@ uintptr_t SvcHandle(uintptr_t *sp)
{ {
uint32_t service_num = 0; uint32_t service_num = 0;
service_num = ((uint32_t) sp[0]); //r0 service_num = ((uint32_t) sp[0]); //r0
//KPrintf("SvcHandle service_num :%d\n ",service_num);
uint8_t param_num = g_service_table[service_num].param_num; uint8_t param_num = g_service_table[service_num].param_num;
uintptr_t *param = sp + 1; uintptr_t *param = sp + 1;
return g_service_table[service_num].fun(service_num,param,param_num) ; return g_service_table[service_num].fun(service_num,param,param_num) ;
@ -86,7 +82,6 @@ uintptr_t SvcHandle(uintptr_t *sp)
uint32_t GetTaskPrivilege(void){ uint32_t GetTaskPrivilege(void){
uint32_t unprivileg = 0; uint32_t unprivileg = 0;
struct TaskDescriptor *task = GetKTaskDescriptor(); struct TaskDescriptor *task = GetKTaskDescriptor();
//KPrintf("GetTaskPrivilege : %s\n", task->task_base_info.name);
if (task->task_dync_sched_member.isolation_flag == 1 && task->task_dync_sched_member.isolation_status == 0) { if (task->task_dync_sched_member.isolation_flag == 1 && task->task_dync_sched_member.isolation_status == 0) {
unprivileg = 1; unprivileg = 1;
} else { } else {

11
arch/arm/cortex-m4/svc_handle.h
View File

@ -42,7 +42,6 @@
#define REG_INT_R9 (7) /* R9 */ #define REG_INT_R9 (7) /* R9 */
#define REG_INT_R10 (8) /* R10 */ #define REG_INT_R10 (8) /* R10 */
#define REG_INT_R11 (9) /* R11 */ #define REG_INT_R11 (9) /* R11 */
//#define REG_INT_EXC_RETURN (10) /* EXC_RETURN */
#else #else
#define REG_INT_PRIMASK (0) /* PRIMASK */ #define REG_INT_PRIMASK (0) /* PRIMASK */
#define REG_INT_R4 (1) /* R4 */ #define REG_INT_R4 (1) /* R4 */
@ -53,17 +52,7 @@
#define REG_INT_R9 (6) /* R9 */ #define REG_INT_R9 (6) /* R9 */
#define REG_INT_R10 (7) /* R10 */ #define REG_INT_R10 (7) /* R10 */
#define REG_INT_R11 (8) /* R11 */ #define REG_INT_R11 (8) /* R11 */
//#define REG_INT_EXC_RETURN (9) /* EXC_RETURN */
#endif #endif
#define EXC_RETURN_BASE 0xffffffe1
#define EXC_RETURN_PROCESS_STACK (1 << 2)
#define EXC_RETURN_THREAD_MODE (1 << 3)
#define EXC_RETURN_STD_CONTEXT (1 << 4)
#define EXC_RETURN_PRIVTHR (EXC_RETURN_BASE | EXC_RETURN_STD_CONTEXT | EXC_RETURN_THREAD_MODE |EXC_RETURN_PROCESS_STACK)
#define EXC_RETURN_UNPRIVTHR (EXC_RETURN_BASE | EXC_RETURN_STD_CONTEXT | EXC_RETURN_THREAD_MODE |EXC_RETURN_PROCESS_STACK)
#endif #endif

3
arch/arm/shared/prepare_ahwstack.c
View File

@ -150,14 +150,11 @@ uint8 KTaskStackSetup(struct TaskDescriptor *task)
StackContex->primask = 0x00000000L; StackContex->primask = 0x00000000L;
#ifdef SEPARATE_COMPILE #ifdef SEPARATE_COMPILE
if(task->task_dync_sched_member.isolation_flag == 1 ) { if(task->task_dync_sched_member.isolation_flag == 1 ) {
//StackContex->exc_ret = EXC_RETURN_UNPRIVTHR;
StackContex->ExErrorStackContex.lr = (unsigned long)USERSPACE->us_taskquit; StackContex->ExErrorStackContex.lr = (unsigned long)USERSPACE->us_taskquit;
} else { } else {
//StackContex->exc_ret = EXC_RETURN_PRIVTHR;
StackContex->ExErrorStackContex.lr = (unsigned long)KTaskQuit; StackContex->ExErrorStackContex.lr = (unsigned long)KTaskQuit;
} }
#else #else
//StackContex->exc_ret = EXC_RETURN_PRIVTHR;
StackContex->ExErrorStackContex.lr = (unsigned long)KTaskQuit; StackContex->ExErrorStackContex.lr = (unsigned long)KTaskQuit;
#endif #endif

11
arch/kswitch.h
View File

@ -1,3 +1,14 @@
/*
* Copyright (c) 2020 AIIT XUOS Lab
* XiUOS is licensed under Mulan PSL v2.
* You can use this software according to the terms and conditions of the Mulan PSL v2.
* You may obtain a copy of Mulan PSL v2 at:
* http://license.coscl.org.cn/MulanPSL2
* THIS SOFTWARE IS PROVIDED ON AN "AS IS" BASIS, WITHOUT WARRANTIES OF ANY KIND,
* EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
* MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
* See the Mulan PSL v2 for more details.
*/
#ifndef __KSWITCH_H__ #ifndef __KSWITCH_H__
#define __KSWITCH_H__ #define __KSWITCH_H__

1
kernel/include/xs_ktask.h
View File

@ -76,7 +76,6 @@ struct TaskDyncSchedMember {
uint8 isolation_status; uint8 isolation_status;
#if defined(ARCH_ARM) #if defined(ARCH_ARM)
uint32_t svc_return; uint32_t svc_return;
uint32_t exc_return;
#endif #endif
#endif #endif