diff --git a/ports/rxv1/ccrx/src/tx_thread_system_return.src b/ports/rxv1/ccrx/src/tx_thread_system_return.src index 2c3a73e47..481c49088 100644 --- a/ports/rxv1/ccrx/src/tx_thread_system_return.src +++ b/ports/rxv1/ccrx/src/tx_thread_system_return.src @@ -40,7 +40,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv1/CCRX */ -;/* 6.1.8 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -73,54 +73,16 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 08-02-2021 William E. Lamie Initial Version 6.1.8 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] BRA __tx_thread_schedule ;} .END diff --git a/ports/rxv1/gnu/src/tx_thread_system_return.S b/ports/rxv1/gnu/src/tx_thread_system_return.S index d13937440..d76ea4092 100644 --- a/ports/rxv1/gnu/src/tx_thread_system_return.S +++ b/ports/rxv1/gnu/src/tx_thread_system_return.S @@ -30,7 +30,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv1/GNURX */ -;/* 6.1.8 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -63,55 +63,17 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 08-02-2021 William E. Lamie Initial Version 6.1.8 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] - BRA __tx_thread_schedule + BRA __tx_thread_system_return ;} .end diff --git a/ports/rxv1/iar/src/tx_thread_system_return.s b/ports/rxv1/iar/src/tx_thread_system_return.s index de17e1890..b7ebe37fb 100644 --- a/ports/rxv1/iar/src/tx_thread_system_return.s +++ b/ports/rxv1/iar/src/tx_thread_system_return.s @@ -27,7 +27,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv1/IAR */ -;/* 6.1.8 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -60,6 +60,8 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 08-02-2021 William E. Lamie Initial Version 6.1.8 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ diff --git a/ports/rxv2/ccrx/src/tx_thread_system_return.src b/ports/rxv2/ccrx/src/tx_thread_system_return.src index 65918cfb6..a022fadc4 100644 --- a/ports/rxv2/ccrx/src/tx_thread_system_return.src +++ b/ports/rxv2/ccrx/src/tx_thread_system_return.src @@ -40,7 +40,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv2/CCRX */ -;/* 6.1.3 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -73,55 +73,17 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 12-31-2020 William E. Lamie Initial Version 6.1.3 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] - BRA __tx_thread_schedule + BRA __tx_thread_system_return ;} .END diff --git a/ports/rxv2/gnu/src/tx_thread_system_return.S b/ports/rxv2/gnu/src/tx_thread_system_return.S index 93578b5f6..43e7023a5 100644 --- a/ports/rxv2/gnu/src/tx_thread_system_return.S +++ b/ports/rxv2/gnu/src/tx_thread_system_return.S @@ -30,7 +30,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv2/GNURX */ -;/* 6.1.3 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -63,54 +63,16 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 12-31-2020 William E. Lamie Initial Version 6.1.3 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] BRA __tx_thread_schedule ;} .end diff --git a/ports/rxv2/iar/src/tx_thread_system_return.s b/ports/rxv2/iar/src/tx_thread_system_return.s index 2c907acf3..e0be27782 100644 --- a/ports/rxv2/iar/src/tx_thread_system_return.s +++ b/ports/rxv2/iar/src/tx_thread_system_return.s @@ -27,7 +27,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv2/IAR */ -;/* 6.1.3 */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -60,6 +60,8 @@ ;/* DATE NAME DESCRIPTION */ ;/* */ ;/* 12-31-2020 William E. Lamie Initial Version 6.1.3 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ diff --git a/ports/rxv3/ccrx/src/tx_thread_system_return.src b/ports/rxv3/ccrx/src/tx_thread_system_return.src index 1baed8fba..f0bd73293 100644 --- a/ports/rxv3/ccrx/src/tx_thread_system_return.src +++ b/ports/rxv3/ccrx/src/tx_thread_system_return.src @@ -40,7 +40,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv3/CCRX */ -;/* 6.x */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -72,56 +72,18 @@ ;/* */ ;/* DATE NAME DESCRIPTION */ ;/* */ -;/* xx-xx-xxxx William E. Lamie Initial Version 6.x */ +;/* 06-02-2021 William E. Lamie Initial Version 6.1.7 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] - BRA __tx_thread_schedule + BRA __tx_thread_system_return ;} .END diff --git a/ports/rxv3/gnu/src/tx_thread_system_return.S b/ports/rxv3/gnu/src/tx_thread_system_return.S index a9535ef42..653be9b36 100644 --- a/ports/rxv3/gnu/src/tx_thread_system_return.S +++ b/ports/rxv3/gnu/src/tx_thread_system_return.S @@ -40,7 +40,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv3/GNURX */ -;/* 6.x */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -72,55 +72,17 @@ ;/* */ ;/* DATE NAME DESCRIPTION */ ;/* */ -;/* xx-xx-xxxx William E. Lamie Initial Version 6.x */ +;/* 06-02-2021 William E. Lamie Initial Version 6.1.7 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), and */ +;/* removed unused code, */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/ ;VOID _tx_thread_system_return(VOID) ;{ .GLB __tx_thread_system_return __tx_thread_system_return: -; -; /* Save call save registers on the stack. */ -; - PUSHM R6-R13 - PUSHC PSW - MOV.L #0, R1 - PUSH.L R1 ; solicited stack frame -; -; /* Lockout interrupts. */ -; - CLRPSW I ; Lockout interrupts -; -; /* Save current stack in current Thread controle block. */ -; _tx_thread_current_ptr -> tx_thread_stack_ptr = SP; - MOV.L #__tx_thread_current_ptr, R2 - MOV.L [R2], R3 - MOV.L R0, 8[R3] - - MOV.L #__tx_timer_time_slice, R4 - MOV.L [R4], R5 -; /* Determine if the time-slice is active. */ -; if (_tx_timer_time_slice) -; { -; - CMP #0,R5 ; Is a time-slice present? - BEQ __tx_thread_dont_save_ts ; No, don't save the time-slice -; -; /* Save time-slice for the thread and clear the current time-slice. */ - ; _tx_thread_current_ptr -> tx_thread_time_slice = _tx_timer_time_slice; - MOV.L R5,24[R3] -; _tx_timer_time_slice = 0; -; - MOV.L R1, [R4] ; Disable the time-slice -; -; } -__tx_thread_dont_save_ts: -; -; /* Clear the current thread pointer. */ -; _tx_thread_current_ptr = TX_NULL; -; - MOV.L R1, [R2] BRA __tx_thread_schedule ;} .end diff --git a/ports/rxv3/iar/src/tx_thread_system_return.s b/ports/rxv3/iar/src/tx_thread_system_return.s index f5a54afa3..aca2453a2 100644 --- a/ports/rxv3/iar/src/tx_thread_system_return.s +++ b/ports/rxv3/iar/src/tx_thread_system_return.s @@ -27,7 +27,7 @@ ;/* FUNCTION RELEASE */ ;/* */ ;/* _tx_thread_system_return RXv3/IAR */ -;/* 6.x */ +;/* 6.1.9 */ ;/* AUTHOR */ ;/* */ ;/* William E. Lamie, Microsoft Corporation */ @@ -59,7 +59,9 @@ ;/* */ ;/* DATE NAME DESCRIPTION */ ;/* */ -;/* xx-xx-xxxx William E. Lamie Initial Version 6.x */ +;/* 06-02-2021 William E. Lamie Initial Version 6.1.7 */ +;/* 10-15-2021 William E. Lamie Modified comment(s), */ +;/* resulting in version 6.1.9 */ ;/* */ ;/**************************************************************************/