azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various fixes for HelloWorld. (#27)

Browse Source
This commit is contained in:
Nikolay Igotti
2016-11-01 15:33:41 +03:00
committed by GitHub
parent b142d39dbc
commit 7eeb2d3046
10 changed files with 70 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
runtime/src/main/cpp/Memory.cpp
+17 -11
View File
@@ -20,21 +20,27 @@ ArenaContainer::ArenaContainer(uint32_t size) {
void ObjectContainer::Init(const TypeInfo* type_info) {
RuntimeAssert(type_info->instanceSize_ >= 0, "Must be an object");
header_ = reinterpret_cast<ContainerHeader*>(
calloc(sizeof(ContainerHeader) + sizeof(ObjHeader) +
type_info->instanceSize_, 1));
header_->ref_count_ = CONTAINER_TAG_INCREMENT;
SetMeta(GetPlace(), type_info);
uint32_t alloc_size =
sizeof(ContainerHeader) + sizeof(ObjHeader) + type_info->instanceSize_;
header_ = reinterpret_cast<ContainerHeader*>(calloc(alloc_size, 1));
if (header_) {
header_->ref_count_ = CONTAINER_TAG_INCREMENT;
SetMeta(GetPlace(), type_info);
}
}
void ArrayContainer::Init(const TypeInfo* type_info, uint32_t elements) {
RuntimeAssert(type_info->instanceSize_ < 0, "Must be an array");
header_ = reinterpret_cast<ContainerHeader*>(
calloc(sizeof(ContainerHeader) + sizeof(ArrayHeader) -
type_info->instanceSize_ * elements, 1));
header_->ref_count_ = CONTAINER_TAG_INCREMENT;
GetPlace()->count_ = elements;
SetMeta(GetPlace(), type_info);
uint32_t alloc_size =
sizeof(ContainerHeader) + sizeof(ArrayHeader) -
type_info->instanceSize_ * elements;
header_ = reinterpret_cast<ContainerHeader*>(calloc(alloc_size, 1));
RuntimeAssert(header_ != nullptr, "Cannot alloc memory");
if (header_) {
header_->ref_count_ = CONTAINER_TAG_INCREMENT;
GetPlace()->count_ = elements;
SetMeta(GetPlace(), type_info);
}
}
ObjHeader* ArenaContainer::PlaceObject(const TypeInfo* type_info) {
runtime/src/main/kotlin/kotlin_native/io/Console.kt
+1 -1
View File
@@ -4,4 +4,4 @@ package kotlin_native.io
external public fun print(message: kotlin_native.String)
@kotlin_native.SymbolName("Kotlin_io_Console_readLine")
external public fun readLine(): kotlin_native.String?
external public fun readLine(): kotlin_native.String