Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:fogus/potion

  • Loading branch information...
commit f46965823a0cab28447415503d97c46d9b83a355 2 parents 153c35f + 6d30002
@orangea orangea authored
Showing with 38 additions and 1 deletion.
  1. +8 −0 core/opcodes.h
  2. +28 −0 doc/core-files.txt
  3. +2 −1  tools/config.sh
View
8 core/opcodes.h
@@ -7,7 +7,11 @@
#ifndef POTION_OPCODES_H
#define POTION_OPCODES_H
+#if defined(__GNUC__)
+#pragma pack(1)
+#else
#pragma pack(push, 1)
+#endif
typedef struct {
u8 code:8;
@@ -15,7 +19,11 @@ typedef struct {
int b:12;
} PN_OP;
+#if defined(__GNUC__)
+#pragma pack()
+#else
#pragma pack(pop)
+#endif
#define PN_OP_AT(asmb, n) ((PN_OP *)((PNFlex *)asmb)->ptr)[n]
#define PN_OP_LEN(asmb) (PN_FLEX_SIZE(asmb) / sizeof(PN_OP))
View
28 doc/core-files.txt
@@ -0,0 +1,28 @@
+|-------------+----------------------------------------------------|
+| File | Description |
+|-------------+----------------------------------------------------|
+| asm.c | some assembler functions |
+| asm.h | some assembler macros |
+| ast.c | the ast for Potion code in-memory |
+| callcc.c | creation and calling of continuations |
+| compile.c | ast to bytecode |
+| contrib.c | stuff written by other folks, seen on blogs, etc. |
+| file.c | loading code and data from files |
+| gc.c | the garbage collector |
+| internal.c | memory allocation and innards |
+| khash.h | a hashtable library, modified to suit potion's gc |
+| lick.c | the interleaved data format |
+| mt19937ar.c | C-program for MT19937, with initialization |
+| number.c | simple math |
+| objmodel.c | much of this is based on the work of ian piumarta |
+| potion.c | the Potion! |
+| primitive.c | methods for the primitive types |
+| string.c | internals of utf-8 and byte strings |
+| syntax.c | A recursive-descent parser generated by greg 0.3.0 |
+| syntax.g | Potion tokens and grammar |
+| table.c | the central table type, based on khash |
+| vm-ppc.c | the powerpc jit (32-bit only) |
+| vm-x86.c | the x86 and x86_64 jit |
+| vm.c | the vm execution loop |
+|-------------+----------------------------------------------------|
+
View
3  tools/config.sh
@@ -15,6 +15,7 @@ fi
JIT_X86=`echo "$TARGET" | sed "/86/!d"`
JIT_PPC=`echo "$TARGET" | sed "/powerpc/!d"`
JIT_I686=`echo "$TARGET" | sed "/i686/!d"`
+JIT_AMD64=`echo "$TARGET" | sed "/amd64/!d"`
if [ $MINGW -eq 0 ]; then
LONG=`echo "#include <stdio.h>
@@ -56,7 +57,7 @@ elif [ "$2" = "strip" ]; then
ARGDIR="1"
fi
-if [ "$2" = "mingw" ]; then
+if [ "$2" = "mingw" ]; then
if [ $MINGW -eq 0 ]; then
echo "0"
else
Please sign in to comment.
Something went wrong with that request. Please try again.