Zxc200611/pocketpy
1
0
Fork 0
mirror of https://github.com/pocketpy/pocketpy synced 2025-10-20 11:30:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix a bug

Browse Source
This commit is contained in:
blueloveTH 2025-04-26 22:14:58 +08:00
parent 0d9bf2e7de
commit 332a51945c
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/retype.yml
View File

@ -3,7 +3,7 @@ output: .retype
url: https://pocketpy.dev url: https://pocketpy.dev
branding: branding:
title: pocketpy title: pocketpy
label: v2.0.8 label: v2.0.9
logo: "./static/logo.png" logo: "./static/logo.png"
favicon: "./static/logo.png" favicon: "./static/logo.png"
meta: meta:

4
include/pocketpy/config.h
View File

@ -1,10 +1,10 @@
#pragma once #pragma once
// clang-format off // clang-format off
#define PK_VERSION "2.0.8" #define PK_VERSION "2.0.9"
#define PK_VERSION_MAJOR 2 #define PK_VERSION_MAJOR 2
#define PK_VERSION_MINOR 0 #define PK_VERSION_MINOR 0
#define PK_VERSION_PATCH 8 #define PK_VERSION_PATCH 9
/*************** feature settings ***************/ /*************** feature settings ***************/
// Whether to compile os-related modules or not // Whether to compile os-related modules or not

34
src/compiler/compiler.c
View File

@ -63,6 +63,7 @@ typedef struct Ctx {
bool is_compiling_class; bool is_compiling_class;
c11_vector /*T=Expr* */ s_expr; c11_vector /*T=Expr* */ s_expr;
c11_smallmap_n2i global_names; c11_smallmap_n2i global_names;
c11_smallmap_s2n co_consts_string_dedup_map;
} Ctx; } Ctx;
typedef struct Expr Expr; typedef struct Expr Expr;
@ -1080,6 +1081,7 @@ static void Ctx__ctor(Ctx* self, CodeObject* co, FuncDecl* func, int level) {
self->is_compiling_class = false; self->is_compiling_class = false;
c11_vector__ctor(&self->s_expr, sizeof(Expr*)); c11_vector__ctor(&self->s_expr, sizeof(Expr*));
c11_smallmap_n2i__ctor(&self->global_names); c11_smallmap_n2i__ctor(&self->global_names);
c11_smallmap_s2n__ctor(&self->co_consts_string_dedup_map);
} }
static void Ctx__dtor(Ctx* self) { static void Ctx__dtor(Ctx* self) {
@ -1089,6 +1091,12 @@ static void Ctx__dtor(Ctx* self) {
} }
c11_vector__dtor(&self->s_expr); c11_vector__dtor(&self->s_expr);
c11_smallmap_n2i__dtor(&self->global_names); c11_smallmap_n2i__dtor(&self->global_names);
// free the dedup map
c11__foreach(c11_smallmap_s2n_KV, &self->co_consts_string_dedup_map, p_kv) {
const char* p = p_kv->key.data;
PK_FREE((void*)p);
}
c11_smallmap_s2n__dtor(&self->co_consts_string_dedup_map);
} }
static int Ctx__prepare_loop_divert(Ctx* self, int line, bool is_break) { static int Ctx__prepare_loop_divert(Ctx* self, int line, bool is_break) {
@ -1198,10 +1206,28 @@ static int Ctx__add_varname(Ctx* self, py_Name name) {
} }
static int Ctx__add_const_string(Ctx* self, c11_sv key) { static int Ctx__add_const_string(Ctx* self, c11_sv key) {
py_Ref p = c11_vector__emplace(&self->co->consts); if(key.size > 100) {
py_newstrv(p, key); py_Ref tmp = c11_vector__emplace(&self->co->consts);
int index = self->co->consts.length - 1; py_newstrv(tmp, key);
return index; int index = self->co->consts.length - 1;
return index;
}
uint16_t* val = c11_smallmap_s2n__try_get(&self->co_consts_string_dedup_map, key);
if(val) {
return *val;
} else {
py_Ref tmp = c11_vector__emplace(&self->co->consts);
py_newstrv(tmp, key);
int index = self->co->consts.length - 1;
// dedup
char* new_buf = PK_MALLOC(key.size + 1);
memcpy(new_buf, key.data, key.size);
new_buf[key.size] = 0;
c11_smallmap_s2n__set(&self->co_consts_string_dedup_map,
(c11_sv){new_buf, key.size},
index);
return index;
}
} }
static int Ctx__add_const(Ctx* self, py_Ref v) { static int Ctx__add_const(Ctx* self, py_Ref v) {

2
src/interpreter/heap.c
View File

@ -44,7 +44,7 @@ void ManagedHeap__collect_if_needed(ManagedHeap* self) {
const int lower = PK_GC_MIN_THRESHOLD / 2; const int lower = PK_GC_MIN_THRESHOLD / 2;
float free_ratio = (float)avg_freed / self->gc_threshold; float free_ratio = (float)avg_freed / self->gc_threshold;
int new_threshold = self->gc_threshold * (1 / free_ratio); int new_threshold = self->gc_threshold * (1 / free_ratio);
printf("gc_threshold=%d, avg_freed=%d, new_threshold=%d\n", self->gc_threshold, avg_freed, new_threshold); // printf("gc_threshold=%d, avg_freed=%d, new_threshold=%d\n", self->gc_threshold, avg_freed, new_threshold);
self->gc_threshold = c11__min(c11__max(new_threshold, lower), upper); self->gc_threshold = c11__min(c11__max(new_threshold, lower), upper);
} }