aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/analyzer.js4
-rw-r--r--src/intertyper.js1
-rw-r--r--system/include/semaphore.h31
-rw-r--r--tests/cases/phientryimplicit.ll24
4 files changed, 58 insertions, 2 deletions
diff --git a/src/analyzer.js b/src/analyzer.js
index 974dd67d..3feaff92 100644
--- a/src/analyzer.js
+++ b/src/analyzer.js
@@ -69,10 +69,10 @@ function analyzer(data, sidePass) {
subItem.labels = [];
// no explicit 'entry' label in clang on LLVM 2.8 - most of the time, but not all the time! - so we add one if necessary
- if (LLVM_STYLE == 'new' && item.items[i+1].intertype !== 'label') {
+ if (item.items[i+1].intertype !== 'label') {
item.items.splice(i+1, 0, {
intertype: 'label',
- ident: toNiceIdent('%0'),
+ ident: toNiceIdent('%1'),
lineNum: subItem.lineNum + '.5'
});
}
diff --git a/src/intertyper.js b/src/intertyper.js
index c9580319..7bc23653 100644
--- a/src/intertyper.js
+++ b/src/intertyper.js
@@ -540,6 +540,7 @@ function intertyper(data, sidePass, baseLineNums) {
return !(token.text in LLVM.LINKAGES || token.text in LLVM.PARAM_ATTR || token.text in LLVM.FUNC_ATTR || token.text in LLVM.CALLING_CONVENTIONS);
});
var params = parseParamTokens(item.tokens[2].item.tokens);
+ if (sidePass) dprint('unparsedFunctions', 'Processing function: ' + item.tokens[1].text);
return [{
intertype: 'function',
ident: toNiceIdent(item.tokens[1].text),
diff --git a/system/include/semaphore.h b/system/include/semaphore.h
new file mode 100644
index 00000000..6ea1553c
--- /dev/null
+++ b/system/include/semaphore.h
@@ -0,0 +1,31 @@
+
+#ifndef _SYS_SEMAPHORE_H
+#define _SYS_SEMAPHORE_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef int sem_t;
+
+sem_t *sem_open(const char *, int, ...);
+int sem_close(sem_t *);
+
+int sem_init(sem_t *, int, unsigned);
+int sem_destroy(sem_t *);
+
+int sem_getvalue(sem_t *, int *);
+int sem_post(sem_t *);
+
+int sem_timedwait(sem_t *, const struct timespec *);
+int sem_trywait(sem_t *);
+int sem_wait(sem_t *);
+
+int sem_unlink(const char *);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/tests/cases/phientryimplicit.ll b/tests/cases/phientryimplicit.ll
new file mode 100644
index 00000000..5b3b0b31
--- /dev/null
+++ b/tests/cases/phientryimplicit.ll
@@ -0,0 +1,24 @@
+; ModuleID = 'tests/hello_world.bc'
+target datalayout = "e-p:32:32:32-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:32:64-f32:32:32-f64:32:64-v64:64:64-v128:128:128-a0:0:64-f80:32:32-n8:16:32-S128"
+target triple = "i386-pc-linux-gnu"
+
+@.str = private unnamed_addr constant [15 x i8] c"hello, world!\0A\00", align 1 ; [#uses=1 type=[15 x i8]*]
+
+; [#uses=0]
+define i32 @main() {
+ %retval = alloca i32, align 4 ; [#uses=1 type=i32*]
+ %16 = trunc i32 1 to i1
+ br i1 %16, label %17, label %26, !dbg !1269853 ; [debug line = 3920:5]
+
+; <label>:17 ; preds = %1
+ %25 = trunc i32 1 to i1
+
+; <label>:26 ; preds = %17, %1
+ %27 = phi i1 [ false, %1 ], [ %25, %17 ] ; [#uses=1 type=i1]
+ store i32 0, i32* %retval
+ %call = call i32 (i8*, ...)* @printf(i8* getelementptr inbounds ([15 x i8]* @.str, i32 0, i32 0)) ; [#uses=0 type=i32]
+ ret i32 1
+}
+
+; [#uses=1]
+declare i32 @printf(i8*, ...)