Embedded/pikapython
1
0
Fork 0
mirror of https://gitee.com/Lyon1998/pikapython.git synced 2025-01-29 17:22:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

use memcpy in args_getStruct

Browse Source
This commit is contained in:
lyon 2021-11-14 10:43:15 +08:00
parent 7e8b60ed96
commit d10bcdf399
4 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
port/linux/test/args-test.cpp
View File

@ -145,6 +145,22 @@ TEST(args, test12) {
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);
} }
struct test {
int a;
float b;
};
TEST(args, struct_) {
Args* args = New_args(NULL);
struct test test_struct = {1, 2.2};
args_setStruct(args, (char*)"test", &test_struct, sizeof(struct test));
struct test test_struct_out;
args_getStruct(args, (char*)"test", &test_struct_out);
EXPECT_EQ(test_struct_out.a, 1);
EXPECT_FLOAT_EQ(test_struct_out.b, 2.2);
args_deinit(args);
EXPECT_EQ(pikaMemNow(), 0);
}
TEST(args, mem) { TEST(args, mem) {
EXPECT_EQ(pikaMemNow(), mem); EXPECT_EQ(pikaMemNow(), mem);
EXPECT_EQ(pikaMemNow(), 0); EXPECT_EQ(pikaMemNow(), 0);

14
src/PikaPlatform.c
View File

@ -1,8 +1,8 @@
#include "PikaPlatform.h" #include "PikaPlatform.h"
#include <stdint.h>
#include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h>
PIKA_WEAK void __platformDisableIrqHandle() { PIKA_WEAK void __platformDisableIrqHandle() {
/* disable irq to support thread */ /* disable irq to support thread */
@ -17,7 +17,7 @@ PIKA_WEAK void* __platformMalloc(size_t size) {
} }
PIKA_WEAK void __platformFree(void* ptr) { PIKA_WEAK void __platformFree(void* ptr) {
return free(ptr); free(ptr);
} }
PIKA_WEAK void __platformPrintf(char* fmt, ...) { PIKA_WEAK void __platformPrintf(char* fmt, ...) {
@ -28,21 +28,21 @@ PIKA_WEAK void __platformPrintf(char* fmt, ...) {
va_end(args); va_end(args);
} }
PIKA_WEAK char* __platformLoadPikaAsm(){ PIKA_WEAK char* __platformLoadPikaAsm() {
/* faild */ /* faild */
return NULL; return NULL;
} }
PIKA_WEAK int32_t __platformSavePikaAsm(char *PikaAsm){ PIKA_WEAK int32_t __platformSavePikaAsm(char* PikaAsm) {
/* faild */ /* faild */
return 1; return 1;
} }
PIKA_WEAK uint8_t __platformAsmIsToFlash(char *pyMultiLine){ PIKA_WEAK uint8_t __platformAsmIsToFlash(char* pyMultiLine) {
/* not to flash */ /* not to flash */
return 0; return 0;
} }
PIKA_WEAK int32_t __platformSavePikaAsmEOF(){ PIKA_WEAK int32_t __platformSavePikaAsmEOF() {
return 1; return 1;
} }

12
src/dataArgs.c
View File

@ -129,14 +129,16 @@ int32_t args_setStruct(Args* self,
if (NULL == struct_ptr) { if (NULL == struct_ptr) {
return 1; return 1;
} }
Arg* structArg = arg_setContent(NULL, (uint8_t*)struct_ptr, struct_size); Arg* struct_arg = arg_setContent(NULL, (uint8_t*)struct_ptr, struct_size);
structArg = arg_setName(structArg, name); struct_arg = arg_setName(struct_arg, name);
args_setArg(self, structArg); args_setArg(self, struct_arg);
return 0; return 0;
} }
void* args_getStruct(Args* self, char* name) { void* args_getStruct(Args* self, char* name, void* struct_out) {
return arg_getContent(args_getArg(self, name)); Arg* struct_arg = args_getArg(self, name);
uint32_t struct_size = arg_getContentSize(struct_arg);
return memcpy(struct_out, arg_getContent(struct_arg), struct_size);
} }
int32_t args_copyArgByName(Args* self, char* name, Args* directArgs) { int32_t args_copyArgByName(Args* self, char* name, Args* directArgs) {

2
src/dataArgs.h
View File

@ -57,7 +57,7 @@ int32_t args_setStruct(Args* self,
char* name, char* name,
void* struct_ptr, void* struct_ptr,
uint32_t struct_size); uint32_t struct_size);
void* args_getStruct(Args* self, char* name); void* args_getStruct(Args* self, char* name, void* struct_out);
int32_t args_set(Args* self, char* name, char* valueStr); int32_t args_set(Args* self, char* name, char* valueStr);
int32_t args_setObjectWithClass(Args* self, int32_t args_setObjectWithClass(Args* self,