From fb61896825a70ab7b379e63d2705f74193ad8d37 Mon Sep 17 00:00:00 2001 From: Nikolay Igotti Date: Tue, 11 Oct 2016 13:25:11 +0300 Subject: [PATCH] Add memory mgmt. --- runtime/src/main/cpp/Memory.cpp | 68 +++++++ runtime/src/main/cpp/Memory.h | 313 ++++++++++++++++++++++++++++++ runtime/src/main/cpp/Names.cpp | 53 +++++ runtime/src/main/cpp/Names.h | 43 ++++ runtime/src/main/cpp/Sha1.cpp | 175 +++++++++++++++++ runtime/src/main/cpp/Sha1.h | 28 +++ runtime/src/main/cpp/TypeInfo.cpp | 17 +- runtime/src/main/cpp/TypeInfo.h | 50 +++-- runtime/src/main/cpp/launcher.cpp | 9 +- 9 files changed, 728 insertions(+), 28 deletions(-) create mode 100644 runtime/src/main/cpp/Memory.cpp create mode 100644 runtime/src/main/cpp/Memory.h create mode 100644 runtime/src/main/cpp/Names.cpp create mode 100644 runtime/src/main/cpp/Names.h create mode 100644 runtime/src/main/cpp/Sha1.cpp create mode 100644 runtime/src/main/cpp/Sha1.h diff --git a/runtime/src/main/cpp/Memory.cpp b/runtime/src/main/cpp/Memory.cpp new file mode 100644 index 00000000000..2b278460315 --- /dev/null +++ b/runtime/src/main/cpp/Memory.cpp @@ -0,0 +1,68 @@ +#include + +#include + +#include "Memory.h" + +void FreeObject(ContainerHeader* header) { + free(header); +} + +ArenaContainer::ArenaContainer(uint32_t size) { + ArenaContainerHeader* header = reinterpret_cast( + calloc(size + sizeof(ArenaContainerHeader), 1)); + header_ = header; + header->ref_count_ = 1; + header->current_ = reinterpret_cast(header_) + sizeof(ArenaContainerHeader); + header->end_ = header->current_ + size; +} + +void ObjectContainer::Init(const TypeInfo* type_info, uint32_t elements) { + header_ = reinterpret_cast( + calloc(sizeof(ContainerHeader) + sizeof(ObjHeader) + + type_info->size_ * elements, 1)); + header_->ref_count_ = 1; + SetMeta(GetPlace(), type_info); +} + +ObjHeader* ArenaContainer::PlaceObject(const TypeInfo* type_info) { + int size = type_info->size_ + sizeof(ObjHeader); + ObjHeader* result = reinterpret_cast(Place(size)); + if (!result) { + return nullptr; + } + SetMeta(result, type_info); + return result; +} + +ArrayHeader* ArenaContainer::PlaceArray(const TypeInfo* type_info, int count) { + int size = sizeof(ArrayHeader) + type_info->size_ * count; + ArrayHeader* result = reinterpret_cast(Place(size)); + if (!result) { + return nullptr; + } + SetMeta(result, type_info); + result->count_ = count; + return result; +} + +#ifdef __cplusplus +extern "C" { +#endif + +void InitMemory() { + // TODO: initialize heap here. +} + +// Now we ignore all placement hints and always allocate heap space for new object. +void* AllocInstance(const TypeInfo* type_info, PlacementHint hint) { + return ObjectContainer(type_info).GetPlace(); +} + +void* AllocArrayInstance(const TypeInfo* type_info, PlacementHint hint, uint32_t elements) { + return ObjectContainer(type_info, elements).GetPlace(); +} + +#ifdef __cplusplus +} +#endif diff --git a/runtime/src/main/cpp/Memory.h b/runtime/src/main/cpp/Memory.h new file mode 100644 index 00000000000..4335826988f --- /dev/null +++ b/runtime/src/main/cpp/Memory.h @@ -0,0 +1,313 @@ +#ifndef RUNTIME_MEMORY_H +#define RUNTIME_MEMORY_H + +#include + +#include "TypeInfo.h" + +typedef enum { + FRAME_SCOPE = 0, + GLOBAL_SCOPE = 1, + ARENA_SCOPE = 2 +} PlacementHint; + +// Could be made 64-bit for large memory configs. +typedef uint32_t container_offset_t; + +// Header of every object. +struct ObjHeader { + const TypeInfo* type_info_; + container_offset_t container_offset_negative_; +}; + +// Header of value type array objects. +struct ArrayHeader : public ObjHeader { + uint32_t count_; +}; + +// Header of all container objects. Contains reference counter. +struct ContainerHeader { + // Reference counter of container. Maybe use some upper bit of counter for + // container type (for polymorphism in ::Release()). + uint32_t ref_count_; +}; + +struct ArenaContainerHeader : public ContainerHeader { + // Current allocation limit. + uint8_t* current_; + // Allocation end. Maybe consider having chunked backing storage + // at cost of smarter ::Release() polymorphic on container type. + uint8_t* end_; +}; + +// Thos two operations are implemented by translator when storing references +// to objects. +inline void AddRef(ContainerHeader* header) { + // Looking at container type we may want to skip AddRef() totally + // (non-escaping stack objects). + header->ref_count_++; +} + +void FreeObject(ContainerHeader* header); + +inline void Release(ContainerHeader* header) { + // Looking at container type we may want to skip Release() totally + // (non-escaping stack objects, permanent objects). + if (--header->ref_count_ == 0) { + FreeObject(header); + } +} + +// Class representing arbitrary placement container. +class Container { + protected: + // Data where everything is being stored. + ContainerHeader* header_; + + void SetMeta(ObjHeader* obj, const TypeInfo* type_info) { + obj->container_offset_negative_ = + reinterpret_cast(obj) - reinterpret_cast(header_); + obj->type_info_ = type_info; + } + + public: + // Increment reference counter associated with container. + void AddRef() { + if (header_) ::AddRef(header_); + } + + // Decrement reference counter associated with container. + // For objects whith tricky lifetime (such as ones shared between threads objects) + // individual container per object (ObjectContainer) shall be created. + // As an alternative, such objects could be evacuated from short-lived containers. + void Release() { + if (header_) ::Release(header_); + } +}; + +// Container for a single object. +class ObjectContainer : public Container { + public: + explicit ObjectContainer(const TypeInfo* type_info) { + Init(type_info, 1); + } + + ObjectContainer(const TypeInfo* type_info, uint32_t elements) { + Init(type_info, elements); + } + + // Object container shalln't have any dtor, as it's being freed by ::Release(). + ObjHeader* GetPlace() const { + return reinterpret_cast( + reinterpret_cast(header_) + sizeof(ContainerHeader)); + } + + private: + void Init(const TypeInfo* type_info, uint32_t elements); +}; + +// Class representing arena-style placement container. +// Container is used for reference counting, +// and it is assumed that objects with related placement will share container. Only +// whole container can be freed, individual objects are not taken into account. +class ArenaContainer : public Container { + public: + explicit ArenaContainer(uint32_t size); + + ~ArenaContainer() { + if (header_) { + assert(header_->ref_count_ == 0); + Dispose(); + } + } + + // Allocation function. + void* Place(int size) { + ArenaContainerHeader* header = reinterpret_cast(header_); + if (header->current_ + size > header->end_) { + return nullptr; + } + void* result = header->current_; + header->current_ += size; + return result; + } + + // Place individual object in this container. + ObjHeader* PlaceObject(const TypeInfo* type_info); + + // Places an array of certain type in this container. Note that array_type_info + // is type info for an array, not for an individual element. Also note that exactly + // same operation could be used to place strings. + ArrayHeader* PlaceArray(const TypeInfo* array_type_info, int count); + + // Dispose whole container ignoring non-zero refcount. Use with care. + void Dispose() { + if (header_) { + FreeObject(header_); + header_ = nullptr; + } + } +}; + +// Raw reference to data, meaning T*, invented only for cleaness of intentions. +template +class RawRef { + private: + T* ptr_; + public: + RawRef(T* ptr) : ptr_(ptr) {} + const T& get() const { return *ptr_; } + void set(const T& value) { *ptr_ = value; } +}; + +// Object reference, adds reference counting in container and type information. +class AnyObjRef { + protected: + ObjHeader* ptr_; + + explicit AnyObjRef(ObjHeader* ptr) : ptr_(ptr) { + if (ptr_) { + AddRef(container_header()); + } + } + + public: + ~AnyObjRef() { + if (ptr_) { + Release(container_header()); + } + } + + ContainerHeader* container_header() const { + return reinterpret_cast( + reinterpret_cast(ptr_) - ptr_->container_offset_negative_); + } + + const TypeInfo* type_info() const { + return ptr_->type_info_; + } + + // Accesses raw data inside object specified by offset. Typing by M is optional and + // will be replaced by translator typing. + template + RawRef at() const { + return RawRef( + reinterpret_cast(reinterpret_cast(any_ref()) + offset)); + } + + // Assign reference to certain object. Releases currently held object in its container and + // adds reference to container storing given object. + void Assign(const AnyObjRef& other) { + // TODO: optimize for an important case where containers match? + if (ptr_) { + Release(container_header()); + } + ptr_ = other.ptr_; + if (ptr_) { + AddRef(container_header()); + } + } + + // Returns pointer to the raw data referred by this reference. + uint8_t* any_ref() const { + if (!ptr_) return nullptr; + return reinterpret_cast(ptr_) + sizeof(ObjHeader); + } + + // Uses pointer stored in object's field to create a reference to that object. + AnyObjRef any_obj_at(int offset) const { + assert(ptr_); + return AnyObjRef(*reinterpret_cast(any_ref() + offset)); + } + + // Checks if given reference has null value. + bool null() const { return ptr_ == nullptr; } +}; + +// Returns typeinfo for array of type T. Specialize for types which are allowed as array elements. +template +const TypeInfo* GetArrayTypeInfo() { + return nullptr; +} + +// Reference to an object with particular memory layout specified by T. +// In real runtime will be compile time only type, on runtime all references are +// AnyObjRef. +template +class ObjRef : public AnyObjRef { + private: + explicit ObjRef(ObjHeader* ptr) : AnyObjRef(ptr) {} + + // Reference to raw data in owned class. + T* ref() const { + if (!ptr_) return nullptr; + return reinterpret_cast(any_ref()); + } + + template friend class ArrayRef; + + public: + // Assigns reference, compile time type-safe. + ObjRef(const ObjRef& other) : AnyObjRef(nullptr) { + Assign(other); + } + void Assign(const ObjRef& other) { + AnyObjRef::Assign(other); + } + + // Copies data bits to another place, reference counting is properly accounted for + // by consulting type information. + void CopyTo(ObjRef other) const; + + // Clones object to given container. + ObjRef Clone(ArenaContainer* container) { + ObjRef result = Alloc(container); + CopyTo(result); + return result; + } + + // Takes typed object reference at offset. + template + ObjRef obj_at() const { + return ObjRef(reinterpret_cast(any_ref() + offset)); + } + + // Allocates properly typed object in container. + static ObjRef Alloc(ArenaContainer* container) { + return ObjRef(container->PlaceObject(T::GetTypeInfo())); + } +}; + +// This is an array of value types only, no object references here. +template +class ArrayRef : public AnyObjRef { + protected: + explicit ArrayRef(ArrayHeader* ptr) : AnyObjRef(ptr) {} + ArrayHeader* header() { return reinterpret_cast(ptr_); } + + public: + static ArrayRef Alloc(ArenaContainer* container, int count) { + auto result = ArrayRef(container->PlaceArray(GetArrayTypeInfo(), count)); + result.header()->count_ = count; + return result; + } + + RawRef element_at(int index) const { + assert(header() && index >= 0 && index < header()->count_); + return reinterpret_cast(any_ref() + index * sizeof(T)); + } +}; + +#ifdef __cplusplus +extern "C" { +#endif + +void InitMemory(); +void* AllocInstance(const TypeInfo* type_info, PlacementHint hint); +void* AllocArrayInstance(const TypeInfo* type_info, PlacementHint hint, uint32_t elements); + +#ifdef __cplusplus +} +#endif + +#endif // RUNTIME_MEMORY_H diff --git a/runtime/src/main/cpp/Names.cpp b/runtime/src/main/cpp/Names.cpp new file mode 100644 index 00000000000..d9f41a0db96 --- /dev/null +++ b/runtime/src/main/cpp/Names.cpp @@ -0,0 +1,53 @@ +#include + +#include "Names.h" + +#include "Sha1.h" + +namespace { + +void Printable(const uint8_t* data, uint32_t data_length, char* hex) { + static const char* hex_digits = "0123456789ABCDEF"; + int i = 0; + for(int i = 0; i < data_length; ++i) { + *hex++ = hex_digits[(*data >> 4) & 0xf]; + *hex++ = hex_digits[(*data++) & 0xf]; + } +} + +} // namespace + +extern "C" { + +// Make local hash out of arbitrary data. +void MakeLocalHash(const void* data, uint32_t size, LocalHash* hash) { + assert(false); // not implemented yet +} + +// Make global hash out of arbitrary data. +void MakeGlobalHash(const void* data, uint32_t size, GlobalHash* hash) { + SHA1_CTX ctx; + SHA1Init(&ctx); + SHA1Update(&ctx, reinterpret_cast(data), size); + SHA1Final(&hash->bits[0], &ctx); +} + +// Make printable C string out of local hash. +void PrintableLocalHash(const LocalHash* hash, char* buffer, uint32_t size) { + if (size < sizeof(*hash) * 2) { + assert(false); + return; + } + Printable(reinterpret_cast(&hash), sizeof(*hash), buffer); +} + +// Make printable C string out of global hash. +void PrintableGlobalHash(const GlobalHash* hash, char* buffer, uint32_t size) { + if (size < sizeof(*hash) * 2) { + assert(false); + return; + } + Printable(hash->bits, sizeof(*hash), buffer); +} + +} // extern "C" diff --git a/runtime/src/main/cpp/Names.h b/runtime/src/main/cpp/Names.h new file mode 100644 index 00000000000..ff019c843f9 --- /dev/null +++ b/runtime/src/main/cpp/Names.h @@ -0,0 +1,43 @@ +#ifndef RUNTIME_NAMES_H +#define RUNTIME_NAMES_H + +#include + +// All names in system are stored as hashes (or maybe, for debug builds, +// as pointers to uniqued C strings containing names?). +// There are two types of hashes: +// - local hash, must be unique per class (CitiHash64 is being used) +// - global hash, must be unique globally (SHA1 is being used) +// Generic guideline is that global hash is being used in global persistent context, while local +// hashes are more local in scope. +// Local hash. +typedef int64_t LocalHash; +// Hash of field name. +typedef LocalHash FieldNameHash; +// Hash of open method name. +typedef LocalHash MethodNameHash; +// Global hash. +typedef struct { + uint8_t bits[20]; +} GlobalHash; +// Hash of function name. +typedef GlobalHash FunctionNameHash; +// Hash of class name. +typedef GlobalHash ClassNameHash; + +#ifdef __cplusplus +extern "C" { +#endif +// Make local hash out of arbitrary data. +void MakeLocalHash(const void* data, uint32_t size, LocalHash* hash); +// Make global hash out of arbitrary data. +void MakeGlobalHash(const void* data, uint32_t size, GlobalHash* hash); +// Make printable C string out of local hash. +void PrintableLocalHash(const LocalHash* hash, char* buffer, uint32_t size); +// Make printable C string out of global hash. +void PrintableGlobalHash(const GlobalHash* hash, char* buffer, uint32_t size); +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // RUNTIME_NAMES_H diff --git a/runtime/src/main/cpp/Sha1.cpp b/runtime/src/main/cpp/Sha1.cpp new file mode 100644 index 00000000000..464b306e586 --- /dev/null +++ b/runtime/src/main/cpp/Sha1.cpp @@ -0,0 +1,175 @@ +/* +SHA-1 in C +By Steve Reid +100% Public Domain + +Test Vectors (from FIPS PUB 180-1) +"abc" + A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D +"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" + 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1 +A million repetitions of "a" + 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F +*/ + +/* #define LITTLE_ENDIAN * This should be #define'd already, if true. */ +/* #define SHA1HANDSOFF * Copies data before messing with it. */ + +#define SHA1HANDSOFF + +#include +#include +#include + +#include "Sha1.h" + +#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits)))) + +/* blk0() and blk() perform the initial expand. */ +/* I got the idea of expanding during the round function from SSLeay */ +#if BYTE_ORDER == LITTLE_ENDIAN +#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \ + |(rol(block->l[i],8)&0x00FF00FF)) +#elif BYTE_ORDER == BIG_ENDIAN +#define blk0(i) block->l[i] +#else +#error "Endianness not defined!" +#endif +#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \ + ^block->l[(i+2)&15]^block->l[i&15],1)) + +/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */ +#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30); +#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30); +#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30); +#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30); + +/* Hash a single 512-bit block. This is the core of the algorithm. */ +static void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) +{ + uint32_t a, b, c, d, e; + typedef union { + unsigned char c[64]; + uint32_t l[16]; + } CHAR64LONG16; +#ifdef SHA1HANDSOFF + CHAR64LONG16 block[1]; /* use array to appear as a pointer */ + memcpy(block, buffer, 64); +#else + /* The following had better never be used because it causes the + * pointer-to-const buffer to be cast into a pointer to non-const. + * And the result is written through. I threw a "const" in, hoping + * this will cause a diagnostic. + */ + CHAR64LONG16* block = (const CHAR64LONG16*)buffer; +#endif + /* Copy context->state[] to working vars */ + a = state[0]; + b = state[1]; + c = state[2]; + d = state[3]; + e = state[4]; + /* 4 rounds of 20 operations each. Loop unrolled. */ + R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3); + R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7); + R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11); + R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15); + R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19); + R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23); + R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27); + R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31); + R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35); + R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39); + R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43); + R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47); + R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51); + R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55); + R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59); + R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63); + R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67); + R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71); + R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75); + R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79); + /* Add the working vars back into context.state[] */ + state[0] += a; + state[1] += b; + state[2] += c; + state[3] += d; + state[4] += e; + /* Wipe variables */ + a = b = c = d = e = 0; +#ifdef SHA1HANDSOFF + memset(block, '\0', sizeof(block)); +#endif +} + +#ifdef __cplusplus +extern "C" { +#endif + +/* SHA1Init - Initialize new context */ +void SHA1Init(SHA1_CTX* context) +{ + /* SHA1 initialization constants */ + context->state[0] = 0x67452301; + context->state[1] = 0xEFCDAB89; + context->state[2] = 0x98BADCFE; + context->state[3] = 0x10325476; + context->state[4] = 0xC3D2E1F0; + context->count[0] = context->count[1] = 0; +} + + +/* Run your data through this. */ +void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len) +{ + uint32_t i, j; + + j = context->count[0]; + if ((context->count[0] += len << 3) < j) + context->count[1]++; + context->count[1] += (len>>29); + j = (j >> 3) & 63; + if ((j + len) > 63) { + memcpy(&context->buffer[j], data, (i = 64-j)); + SHA1Transform(context->state, context->buffer); + for ( ; i + 63 < len; i += 64) { + SHA1Transform(context->state, &data[i]); + } + j = 0; + } + else i = 0; + memcpy(&context->buffer[j], &data[i], len - i); +} + +/* Add padding and return the message digest. */ +void SHA1Final(unsigned char digest[20], SHA1_CTX* context) +{ + unsigned i; + unsigned char finalcount[8]; + unsigned char c; + + for (i = 0; i < 8; i++) { + finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)] + >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */ + } + c = 0200; + SHA1Update(context, &c, 1); + while ((context->count[0] & 504) != 448) { + c = 0000; + SHA1Update(context, &c, 1); + } + SHA1Update(context, finalcount, 8); /* Should cause a SHA1Transform() */ + for (i = 0; i < 20; i++) { + digest[i] = (unsigned char) + ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255); + } + /* Wipe variables */ + memset(context, '\0', sizeof(*context)); + memset(&finalcount, '\0', sizeof(finalcount)); +} + +#ifdef __cplusplus +} +#endif diff --git a/runtime/src/main/cpp/Sha1.h b/runtime/src/main/cpp/Sha1.h new file mode 100644 index 00000000000..8a9c47f7d34 --- /dev/null +++ b/runtime/src/main/cpp/Sha1.h @@ -0,0 +1,28 @@ +#ifndef RUNTIME_SHA1_H +#define RUNTIME_SHA1_H +/* ================ sha1.h ================ */ +/* +SHA-1 in C +By Steve Reid +100% Public Domain +*/ + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct SHA1_CTX { + uint32_t state[5]; + uint32_t count[2]; + unsigned char buffer[64]; +} SHA1_CTX; + +void SHA1Init(SHA1_CTX* context); +void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len); +void SHA1Final(unsigned char digest[20], SHA1_CTX* context); + +#ifdef __cplusplus +} +#endif + +#endif // RUNTIME_UTIL_SHA1_H diff --git a/runtime/src/main/cpp/TypeInfo.cpp b/runtime/src/main/cpp/TypeInfo.cpp index 3e9919a3c02..c4878c26852 100644 --- a/runtime/src/main/cpp/TypeInfo.cpp +++ b/runtime/src/main/cpp/TypeInfo.cpp @@ -2,8 +2,15 @@ #include "TypeInfo.h" extern "C" { - int lookupField(TypeInfo* info, NameHash nameSignature) { - assert(false); // not implemented yet - return -1; - } -} \ No newline at end of file + +int LookupFieldOffset(const TypeInfo* info, FieldNameHash nameSignature) { + assert(false); // not implemented yet + return -1; +} + +void* LookupMethod(const TypeInfo* info, MethodNameHash nameSignature) { + assert(false); // not implemented yet + return nullptr; +} + +} diff --git a/runtime/src/main/cpp/TypeInfo.h b/runtime/src/main/cpp/TypeInfo.h index feea599a316..f3fa4d70ca8 100644 --- a/runtime/src/main/cpp/TypeInfo.h +++ b/runtime/src/main/cpp/TypeInfo.h @@ -3,38 +3,48 @@ #include -// All names in system are stored as hashes (or maybe, for debug builds, -// as pointers to uniqued C strings containing names?). -typedef int64_t NameHash; +#include "Names.h" // An element of sorted by hash in-place array representing methods. struct MethodTableRecord { - NameHash nameSignature; - void* methodEntryPoint; + MethodNameHash nameSignature_; + void* methodEntryPoint_; }; // An element of sorted by hash in-place array representing field offsets. struct FieldTableRecord { - NameHash nameSignature; - int fieldOffset; + FieldNameHash nameSignature_; + int fieldOffset_; }; // This struct represents runtime type information and by itself is compile time // constant. struct TypeInfo { - NameHash name; - int size; - const TypeInfo* superType; - const int* objOffsets; - int objOffsetsCount; - TypeInfo* const* implementedInterfaces; - int implementedInterfacesCount; - void* const* vtable; // TODO: place vtable at the end of TypeInfo to eliminate the indirection - const MethodTableRecord* methods; - int methodsCount; - const FieldTableRecord* fields; - int fieldsCount; + ClassNameHash name_; + int size_; + const TypeInfo* superType_; + const int* objOffsets_; + int objOffsetsCount_; + TypeInfo* const* implementedInterfaces_; + int implementedInterfacesCount_; + void* const* vtable_; // TODO: place vtable at the end of TypeInfo to eliminate the indirection + const MethodTableRecord* methods_; + int methodsCount_; + const FieldTableRecord* fields_; + int fieldsCount_; }; +#ifdef __cplusplus +extern "C" { +#endif +// Find offset of given hash in table. +int LookupFieldOffset(const TypeInfo* type_info, LocalHash hash); -#endif //RUNTIME_TYPEINFO_H +// Find method by its hash. +void* LookupMethod(const TypeInfo* info, MethodNameHash nameSignature); + +#ifdef __cplusplus +} // extern "C" +#endif + +#endif // RUNTIME_TYPEINFO_H diff --git a/runtime/src/main/cpp/launcher.cpp b/runtime/src/main/cpp/launcher.cpp index cc2d10187d1..e84c2ef645e 100644 --- a/runtime/src/main/cpp/launcher.cpp +++ b/runtime/src/main/cpp/launcher.cpp @@ -1,6 +1,9 @@ +#include "Memory.h" + extern "C" void kotlinNativeMain(); int main() { - kotlinNativeMain(); - return 0; -} \ No newline at end of file + InitMemory(); + kotlinNativeMain(); + return 0; +}