mirror of
https://github.com/nunuhara/xsystem4.git
synced 2026-09-22 23:18:01 +03:00
kichikuou
f0e25e53d7
In hll_call(), pointers to heap data passed by reference could become invalid if the heap was reallocated during the call. The previous implementation attempted to prevent this by calling heap_guarantee() to pre-allocate heap space. However, this approach does not work for certain functions in PastelChime2 HLL, which can perform an unbounded number of heap allocations. This commit removes heap_guarantee() and replaces it with a more robust copy-in/copy-out strategy: - Before the call (Copy-in): For reference arguments, the pointer value is copied from the heap to a local variable on the stack. A pointer to this local variable is then passed to the HLL function. - After the call (Copy-out): The pointer value, which may have been modified by the HLL function, is written back from the local variable to its original slot in the heap.
89 lines
2.2 KiB
C
89 lines
2.2 KiB
C
/* Copyright (C) 2019 Nunuhara Cabbage <nunuhara@haniwa.technology>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, see <http://gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef SYSTEM4_HEAP_H
|
|
#define SYSTEM4_HEAP_H
|
|
|
|
#include <stdbool.h>
|
|
#include <stddef.h>
|
|
#include <stdint.h>
|
|
|
|
struct string;
|
|
struct page;
|
|
|
|
enum vm_pointer_type {
|
|
VM_PAGE,
|
|
VM_STRING
|
|
};
|
|
#define NR_VM_POINTER_TYPES (VM_STRING+1)
|
|
|
|
// Heap-backed objects. Reference counted.
|
|
struct vm_pointer {
|
|
int ref;
|
|
uint32_t seq;
|
|
enum vm_pointer_type type;
|
|
union {
|
|
struct string *s;
|
|
struct page *page;
|
|
};
|
|
#ifdef DEBUG_HEAP
|
|
size_t alloc_addr;
|
|
size_t ref_addr[16];
|
|
size_t ref_nr;
|
|
size_t deref_addr[16];
|
|
size_t deref_nr;
|
|
size_t free_addr;
|
|
#endif
|
|
};
|
|
|
|
extern struct vm_pointer *heap;
|
|
extern size_t heap_size;
|
|
|
|
void heap_init(void);
|
|
void heap_delete(void);
|
|
void heap_grow(size_t new_size);
|
|
|
|
int32_t heap_alloc_slot(enum vm_pointer_type type);
|
|
void heap_ref(int slot);
|
|
void heap_unref(int slot);
|
|
void exit_unref(int slot);
|
|
|
|
uint32_t heap_get_seq(int slot);
|
|
|
|
bool heap_index_valid(int index);
|
|
bool page_index_valid(int index);
|
|
bool string_index_valid(int index);
|
|
|
|
struct page *heap_get_page(int index);
|
|
struct page *heap_get_delegate_page(int index);
|
|
struct string *heap_get_string(int index);
|
|
void heap_set_page(int slot, struct page *page);
|
|
void heap_string_assign(int slot, struct string *string);
|
|
void heap_struct_assign(int lval, int rval);
|
|
int32_t heap_alloc_page(struct page *page);
|
|
int32_t heap_alloc_string(struct string *s);
|
|
|
|
void heap_describe_slot(int slot);
|
|
|
|
#ifdef VM_PRIVATE
|
|
|
|
extern uint32_t heap_next_seq;
|
|
extern int32_t *heap_free_stack;
|
|
extern size_t heap_free_ptr;
|
|
|
|
#endif /* VM_PRIVATE */
|
|
#endif /* SYSTEM4_HEAP_H */
|