提交: aa09df1005a8a6c4ae1be00d1229c4337c89a4cb - kmbasic2 (git)

BASIC compiler/interpreter for PIC32MX/MZ-80K

Commit MetaInfo

• 修訂: aa09df1005a8a6c4ae1be00d1229c4337c89a4cb (tree)
• 時間: 2019-05-13 12:23:49
• 作者: Katsumi <kmorimatsu@sour...>
• Commiter: Katsumi

Log Message

Revise comments in clib template.

Change Summary

• modified: mips/clib/clib.c
• modified: mips/clib/clib.h
• modified: mips/clib/example.c
• modified: mips/clib/nbproject/private/private.xml

差異

--- a/mips/clib/clib.c
+++ b/mips/clib/clib.c
@@ -36,7 +36,9 @@ const void* const clibdata[]={
  * This function will be called when initializing library,
  * and used to exchange data between MachiKania BASIC and this library.
  * This is only a function placed in .machikania_clib section for providing
- * static start address at 0xA0000100.
+ * static start address at 0xA0008000. When editing this function is required,
+ * the size of kseg2_program_mem and address of kseg0_program_mem 
+ * in linker script must be changed.
  */
 void* CLIBINIT clib_init(void** data){
 	// Store pointer to data

--- a/mips/clib/clib.h
+++ b/mips/clib/clib.h
@@ -4,12 +4,15 @@
  *                                 *
  ***********************************/
 
+
+// Definition of data and program area.
+// See also linker library.
+// When expansion of data area size is required, edit following value
+// as well as kseg1_data_mem in linker script.
 #define CLIB_PROGMRAM_MEM 0xA0008000
 #define CLIB_DATA_MEM_SIZE 0x0080
 #define CLIB_DATA_MEM (CLIB_PROGMRAM_MEM-CLIB_DATA_MEM_SIZE)
 
-
-
 // Global variables
 // These must be defined by user
 extern const void* const functions[];
@@ -26,9 +29,9 @@ void init(void);
 	malloc(int size);
 	calloc(int size);
 */
-extern void** g_data;
 #define malloc(x) clib_calloc(((x)+3)>>2,g_data) 
 #define calloc(x) clib_calloc(((x)+3)>>2,g_data) 
+extern void** g_data;
 void* clib_calloc(int size, void** g_data);
 
 /*

--- a/mips/clib/example.c
+++ b/mips/clib/example.c
@@ -26,8 +26,6 @@ char* test_private(int param1){
 	}
 }
 char* test_public(int param1){
-	void* test=malloc(16);
-	free(test);
 	return test_private(param1);
 }
 

--- a/mips/clib/nbproject/private/private.xml
+++ b/mips/clib/nbproject/private/private.xml
@@ -5,6 +5,7 @@
         <group>
             <file>file:/C:/Users/kmorimatsu/Documents/At%20Home/PIC/PIC32/PIC32MX370F512H/clib/clib.X/clib.h</file>
             <file>file:/C:/Users/kmorimatsu/Documents/At%20Home/PIC/PIC32/PIC32MX370F512H/clib/clib.X/clib.c</file>
+            <file>file:/C:/Users/kmorimatsu/Documents/At%20Home/PIC/PIC32/PIC32MX370F512H/clib/clib.X/clib_p32MX370F512H.ld</file>
             <file>file:/C:/Users/kmorimatsu/Documents/At%20Home/PIC/PIC32/PIC32MX370F512H/clib/clib.X/example.c</file>
         </group>
     </open-files>