Skip to content

Commit 798144d

Browse files
yuji-katoriyuji-katori
authored
Add files via upload
1 parent bdc37f3 commit 798144d

File tree

14 files changed

+2119
-1270
lines changed

14 files changed

+2119
-1270
lines changed

‎mtkernel_3/config/config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
/* Version Number */
5252
#define CFN_VER_MAKER 0x0008
5353
#define CFN_VER_PRID 0x0002
54-
#define CFN_VER_PRVER 0
54+
#define CFN_VER_PRVER 0x0001
5555
#define CFN_VER_PRNO1 0x524C
5656
#define CFN_VER_PRNO2 0x3738
5757
#define CFN_VER_PRNO3 0x4343

‎mtkernel_3/docs/uTK3.0_C-First構築手順書.pdf

97 Bytes
Binary file not shown.

‎mtkernel_3/docs/uTK3.0共通実装仕様書.pdf

0 Bytes
Binary file not shown.

‎mtkernel_3/ide/cs/C_First.mtpj

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<CubeSuiteProject>
2-
<ProductVersion>9.05.00.00</ProductVersion>
2+
<ProductVersion>9.07.00.00</ProductVersion>
33
<Class Guid="68f4a651-b9cd-473b-a595-b00447132ffa">
44
<Instance Guid="00000000-0000-0000-0000-000000000000">
55
<FormatVersion>2.0</FormatVersion>
6-
<FileVersion>9.5</FileVersion>
6+
<FileVersion>9.7</FileVersion>
77
<ProjectGuid>360d393f-a67c-4112-8950-f73255639012</ProjectGuid>
88
<ProjectItemGuid>b0f35b25-4ef3-4df4-b0b0-79d2ec13fa19</ProjectItemGuid>
99
<FileCategoryGuid>cc4aebea-e90e-4d62-8ab7-a796e67dc2be</FileCategoryGuid>
@@ -1125,6 +1125,7 @@
11251125
</Class>
11261126
<Class Guid="fb98844b-2c27-4275-9804-f6e63e204da0">
11271127
<Instance Guid="fb98844b-2c27-4275-9804-f6e63e204da0">
1128+
<TypeOfStorageOfUserSettings>UserMtudFile</TypeOfStorageOfUserSettings>
11281129
<UseStandardLicenseOnly>True</UseStandardLicenseOnly>
11291130
<MemoCount>0</MemoCount>
11301131
</Instance>
@@ -1162,7 +1163,7 @@
11621163
</Class>
11631164
<Class Guid="1159186b-b838-4741-8324-8293bf3d5c5f">
11641165
<Instance Guid="1159186b-b838-4741-8324-8293bf3d5c5f">
1165-
<DataFormatVersion>1.3</DataFormatVersion>
1166+
<DataFormatVersion>1.4</DataFormatVersion>
11661167
<BuildModeCount>1</BuildModeCount>
11671168
<BuildMode0>RABlAGYAYQB1AGwAdABCAHUAaQBsAGQA</BuildMode0>
11681169
<BatchBuildFlag0>False</BatchBuildFlag0>
@@ -1301,6 +1302,7 @@
13011302
<COptionISystem-DefaultValue />
13021303
<DependencyFileExistCheckingType-DefaultValue>Rebuild</DependencyFileExistCheckingType-DefaultValue>
13031304
<GeneralOptionErrorFileName-DefaultValue>%ProjectName%.err</GeneralOptionErrorFileName-DefaultValue>
1305+
<GeneralOptionLimitDevice-DefaultValue>Limit</GeneralOptionLimitDevice-DefaultValue>
13041306
<GeneralOptionObjPath-DefaultValue>%BuildModeName%</GeneralOptionObjPath-DefaultValue>
13051307
<HexOptionOutputFolder-DefaultValue>%BuildModeName%</HexOptionOutputFolder-DefaultValue>
13061308
<LibOptionOutputFileName-DefaultValue>%ProjectName%.lib</LibOptionOutputFileName-DefaultValue>
@@ -1319,7 +1321,7 @@
13191321
<LibOptionLibraryRuntime-DefaultValue>False</LibOptionLibraryRuntime-DefaultValue>
13201322
<LinkOptionLibraryRuntime-DefaultValue>True</LinkOptionLibraryRuntime-DefaultValue>
13211323
<IsLockedByUser>False</IsLockedByUser>
1322-
<TimeTagModified--0>-8585709650017857256</TimeTagModified--0>
1324+
<TimeTagModified--0>-8585585012209738083</TimeTagModified--0>
13231325
<BuildMode-0>DefaultBuild</BuildMode-0>
13241326
<Memo-0 />
13251327
<OutputMessageFormat-0>%TargetFiles%</OutputMessageFormat-0>
@@ -1343,10 +1345,11 @@
13431345
<LinkOptionSecurityId-0>00000000000000000000</LinkOptionSecurityId-0>
13441346
<DependencyFileExistCheckingType-0>Rebuild</DependencyFileExistCheckingType-0>
13451347
<GeneralOptionErrorFileName-0>%ProjectName%.err</GeneralOptionErrorFileName-0>
1348+
<GeneralOptionLimitDevice-0>Limit</GeneralOptionLimitDevice-0>
13461349
<GeneralOptionObjPath-0>%BuildModeName%</GeneralOptionObjPath-0>
13471350
<TemporaryFolder-0 />
13481351
<GeneralOptionOtherAdditionalOptions-0 />
1349-
<LastCompilerVersion-0>V1.10.00</LastCompilerVersion-0>
1352+
<LastCompilerVersion-0>V1.11.00</LastCompilerVersion-0>
13501353
</Instance>
13511354
<Instance Guid="86bebc9e-2f6f-4e72-83c8-8883e6cf6d33">
13521355
<COptionAsmPath-DefaultValue>False</COptionAsmPath-DefaultValue>
@@ -1654,7 +1657,7 @@ CS_PIN_POSAD
16541657
<LinkOptionShowCFI-DefaultValue>False</LinkOptionShowCFI-DefaultValue>
16551658
<LinkOptionRrmValue-DefaultValue />
16561659
<IsLockedByUser>False</IsLockedByUser>
1657-
<TimeTagModified--0>-8585704415574685454</TimeTagModified--0>
1660+
<TimeTagModified--0>-8585584828019277703</TimeTagModified--0>
16581661
<LinkOptionAutoSectionLayout-0>True</LinkOptionAutoSectionLayout-0>
16591662
<LinkOptionCpu-0>False</LinkOptionCpu-0>
16601663
<LinkOptionDebug-0>Debug</LinkOptionDebug-0>
@@ -1778,11 +1781,12 @@ _cfn_max_almid
17781781
<HexOptionFixRecordLengthAndAlign-DefaultValue>False</HexOptionFixRecordLengthAndAlign-DefaultValue>
17791782
<HexOptionChangeMessageWarningNumber-DefaultValue />
17801783
<HexOptionFixRecordLengthAndAlignValue-DefaultValue>1</HexOptionFixRecordLengthAndAlignValue-DefaultValue>
1781-
<HexOptionByteCount-DefaultValue>False</HexOptionByteCount-DefaultValue>
17821784
<HexOptionChangeMessageError-DefaultValue>None</HexOptionChangeMessageError-DefaultValue>
1785+
<HexOptionFixRecordLengthAndAlignValue2-DefaultValue>1</HexOptionFixRecordLengthAndAlignValue2-DefaultValue>
17831786
<HexOptionVerboseCrc-DefaultValue>False</HexOptionVerboseCrc-DefaultValue>
1784-
<HexOptionByteCountValue-DefaultValue>FF</HexOptionByteCountValue-DefaultValue>
1787+
<HexOptionByteCount-DefaultValue>False</HexOptionByteCount-DefaultValue>
17851788
<HexOptionChangeMessageErrorNumber-DefaultValue />
1789+
<HexOptionByteCountValue-DefaultValue>FF</HexOptionByteCountValue-DefaultValue>
17861790
<HexOptionEndRecord-DefaultValue>None</HexOptionEndRecord-DefaultValue>
17871791
<HexOptionS9-DefaultValue>False</HexOptionS9-DefaultValue>
17881792
<IsLockedByUser>False</IsLockedByUser>
@@ -1814,11 +1818,12 @@ _cfn_max_almid
18141818
<HexOptionFixRecordLengthAndAlign-0>False</HexOptionFixRecordLengthAndAlign-0>
18151819
<HexOptionChangeMessageWarningNumber-0 />
18161820
<HexOptionFixRecordLengthAndAlignValue-0>1</HexOptionFixRecordLengthAndAlignValue-0>
1817-
<HexOptionByteCount-0>False</HexOptionByteCount-0>
18181821
<HexOptionChangeMessageError-0>None</HexOptionChangeMessageError-0>
1822+
<HexOptionFixRecordLengthAndAlignValue2-0>1</HexOptionFixRecordLengthAndAlignValue2-0>
18191823
<HexOptionVerboseCrc-0>False</HexOptionVerboseCrc-0>
1820-
<HexOptionByteCountValue-0>FF</HexOptionByteCountValue-0>
1824+
<HexOptionByteCount-0>False</HexOptionByteCount-0>
18211825
<HexOptionChangeMessageErrorNumber-0 />
1826+
<HexOptionByteCountValue-0>FF</HexOptionByteCountValue-0>
18221827
<HexOptionEndRecord-0>None</HexOptionEndRecord-0>
18231828
<HexOptionS9-0>False</HexOptionS9-0>
18241829
</Instance>
@@ -1858,7 +1863,7 @@ _cfn_max_almid
18581863
<LibOptionChangeMessageError-DefaultValue>None</LibOptionChangeMessageError-DefaultValue>
18591864
<LibOptionChangeMessageErrorNumber-DefaultValue />
18601865
<IsLockedByUser>False</IsLockedByUser>
1861-
<TimeTagModified--0>-8585704415574685454</TimeTagModified--0>
1866+
<TimeTagModified--0>-8585584828019277703</TimeTagModified--0>
18621867
<LibOptionDebug-0>Debug</LibOptionDebug-0>
18631868
<LibOptionForm-0>LibraryU</LibOptionForm-0>
18641869
<LibOptionInput-0 />
@@ -2630,7 +2635,7 @@ _cfn_max_almid
26302635
<SourceItem39-IsLockedByUser>False</SourceItem39-IsLockedByUser>
26312636
<SourceItem39-BuildingTarget-0>True</SourceItem39-BuildingTarget-0>
26322637
<SourceItem39-IndividualCompileOption-0>False</SourceItem39-IndividualCompileOption-0>
2633-
<TimeTagModified-SourceItem40--0>-8585704415574695512</TimeTagModified-SourceItem40--0>
2638+
<TimeTagModified-SourceItem40--0>-8585584828019277703</TimeTagModified-SourceItem40--0>
26342639
<SourceItem40-IsLockedByUser>False</SourceItem40-IsLockedByUser>
26352640
<SourceItem40-BuildingTarget-0>True</SourceItem40-BuildingTarget-0>
26362641
<SourceItem40-IndividualCompileOption-0>False</SourceItem40-IndividualCompileOption-0>

‎mtkernel_3/kernel/knlinc/kernel.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ struct task_control_block {
105105
#endif
106106

107107
void *isstack; /* stack pointer initial value */
108-
// CTXB tskctxb; /* Task context block */
109108
#if USE_OBJECT_NAME
110109
#ifdef CLANGSPEC
111110
VB name[OBJECT_NAME_LENGTH]; /* name */
@@ -238,8 +237,8 @@ IMPORT void *knl_lowmem_top, *knl_lowmem_limit;
238237
/*
239238
* CPU control (cpu.c)
240239
*/
241-
IMPORT void knl_set_reg( CTXB *ctxb, CONST T_REGS *regs, CONST T_EIT *eit, CONST T_CREGS *cregs );
242-
IMPORT void knl_get_reg( CTXB *ctxb, T_REGS *regs, T_EIT *eit, T_CREGS *cregs );
240+
IMPORT void knl_set_reg( TCB *tcb, CONST T_REGS *regs, CONST T_EIT *eit, CONST T_CREGS *cregs );
241+
IMPORT void knl_get_reg( TCB *tcb, T_REGS *regs, T_EIT *eit, T_CREGS *cregs );
243242

244243
/*
245244
* Interuupt control (interrupt.c)

‎mtkernel_3/kernel/sysdepend/cpu/core/rl78s3/cpu_cntl.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@
2525
/*
2626
* Set task register contents (Used in tk_set_reg())
2727
*/
28-
EXPORT void knl_set_reg( CTXB *ctxb, CONST T_REGS *regs, CONST T_EIT *eit, CONST T_CREGS *cregs )
28+
EXPORT void knl_set_reg( TCB *tcb, CONST T_REGS *regs, CONST T_EIT *eit, CONST T_CREGS *cregs )
2929
{
3030
SStackFrame *ssp;
3131
INT i;
3232

33-
ssp = ctxb->ssp;
33+
ssp = cregs != NULL ? cregs->sp : tcb->tskctxb.ssp;
3434

3535
if ( cregs != NULL ) {
3636
ssp = cregs->sp;
@@ -47,7 +47,7 @@ EXPORT void knl_set_reg( CTXB *ctxb, CONST T_REGS *regs, CONST T_EIT *eit, CONST
4747
}
4848

4949
if ( cregs != NULL ) {
50-
ctxb->ssp = cregs->sp;
50+
tcb->tskctxb.ssp = cregs->sp;
5151
}
5252
}
5353

@@ -56,12 +56,12 @@ EXPORT void knl_set_reg( CTXB *ctxb, CONST T_REGS *regs, CONST T_EIT *eit, CONST
5656
/*
5757
* Get task register contents (Used in tk_get_reg())
5858
*/
59-
EXPORT void knl_get_reg( CTXB *ctxb, T_REGS *regs, T_EIT *eit, T_CREGS *cregs )
59+
EXPORT void knl_get_reg( TCB *tcb, T_REGS *regs, T_EIT *eit, T_CREGS *cregs )
6060
{
6161
SStackFrame *ssp;
6262
INT i;
6363

64-
ssp = ctxb->ssp;
64+
ssp = tcb->tskctxb.ssp;
6565

6666
if ( regs != NULL ) {
6767
for ( i = 0; i < 3; ++i ) {
@@ -75,7 +75,7 @@ EXPORT void knl_get_reg( CTXB *ctxb, T_REGS *regs, T_EIT *eit, T_CREGS *cregs )
7575
}
7676

7777
if ( cregs != NULL ) {
78-
cregs->sp = ctxb->ssp;
78+
cregs->sp = tcb->tskctxb.ssp;
7979
}
8080
}
8181

‎mtkernel_3/kernel/tkernel/cpuctl.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ SYSCALL ER tk_set_reg( ID tskid, CONST T_REGS *pk_regs, CONST T_EIT *pk_eit, CON
7676
if ( tcb->state == TS_NONEXIST ) {
7777
ercd = E_NOEXS;
7878
} else {
79-
knl_set_reg(&(tcb->tskctxb), pk_regs, pk_eit, pk_cregs);
79+
knl_set_reg(tcb, pk_regs, pk_eit, pk_cregs);
8080
}
8181
END_CRITICAL_SECTION;
8282

@@ -104,7 +104,7 @@ SYSCALL ER tk_get_reg( ID tskid, T_REGS *pk_regs, T_EIT *pk_eit, T_CREGS *pk_cre
104104
if ( tcb->state == TS_NONEXIST ) {
105105
ercd = E_NOEXS;
106106
} else {
107-
knl_get_reg(&(tcb->tskctxb), pk_regs, pk_eit, pk_cregs);
107+
knl_get_reg(tcb, pk_regs, pk_eit, pk_cregs);
108108
}
109109
END_CRITICAL_SECTION;
110110

@@ -141,7 +141,7 @@ SYSCALL ER td_set_reg( ID tskid, CONST T_REGS *regs, CONST T_EIT *eit, CONST T_C
141141
if ( tcb->state == TS_NONEXIST ) {
142142
ercd = E_NOEXS;
143143
} else {
144-
knl_set_reg((CTXB*)tcb, regs, eit, cregs);
144+
knl_set_reg(tcb, regs, eit, cregs);
145145
}
146146
END_DISABLE_INTERRUPT;
147147

@@ -170,7 +170,7 @@ SYSCALL ER td_get_reg( ID tskid, T_REGS *regs, T_EIT *eit, T_CREGS *cregs )
170170
if ( tcb->state == TS_NONEXIST ) {
171171
ercd = E_NOEXS;
172172
} else {
173-
knl_get_reg((CTXB*)tcb, regs, eit, cregs);
173+
knl_get_reg(tcb, regs, eit, cregs);
174174
}
175175
END_DISABLE_INTERRUPT;
176176

‎mtkernel_3/kernel/tkernel/task_manage.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,6 +233,9 @@ SYSCALL void tk_ext_tsk( void )
233233
allocate the dummy area on the stack. */
234234
volatile VB _dummy[DORMANT_STACK_SIZE];
235235
#endif
236+
#ifdef __CCRL__
237+
volatile VW _dummy;
238+
#endif /* __CCRL__ */
236239

237240
/* Check context error */
238241
#if CHK_CTX2
@@ -257,6 +260,9 @@ SYSCALL void tk_ext_tsk( void )
257260
#ifdef DORMANT_STACK_SIZE
258261
_dummy[0] = 0;
259262
#endif
263+
#ifdef __CCRL__
264+
_dummy = 0;
265+
#endif /* __CCRL__ */
260266
}
261267
#endif /* USE_FUNC_TK_EXT_TSK */
262268

0 commit comments

Comments
 (0)