[svn:parrot] r44152 - in trunk: config/gen/makefiles examples/nci src src/nci tools/build
plobsing at svn.parrot.org
plobsing at svn.parrot.org
Fri Feb 19 01:53:14 UTC 2010
Author: plobsing
Date: Fri Feb 19 01:53:12 2010
New Revision: 44152
URL: https://trac.parrot.org/parrot/changeset/44152
Log:
remove references to now non-existant src/call_list.txt
Modified:
trunk/config/gen/makefiles/root.in
trunk/examples/nci/QtHelloWorld.pasm
trunk/examples/nci/QtHelloWorld.pir
trunk/src/nci/api.c
trunk/src/nci/core_thunks.nci
trunk/src/nci/extra_thunks.nci
trunk/src/nci_test.c
trunk/tools/build/nativecall.pir
Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/config/gen/makefiles/root.in Fri Feb 19 01:53:12 2010 (r44152)
@@ -226,7 +226,6 @@
$(GEN_MAKEFILES) \
ext/Parrot-Embed/Makefile.PL \
myconfig \
- src/call_list.txt \
MANIFEST.configure.generated \
.configure_trace.sto \
.parrot_current_rev \
Modified: trunk/examples/nci/QtHelloWorld.pasm
==============================================================================
--- trunk/examples/nci/QtHelloWorld.pasm Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/examples/nci/QtHelloWorld.pasm Fri Feb 19 01:53:12 2010 (r44152)
@@ -21,7 +21,8 @@
Note that this will either need JIT for building the NCI-functions on
the fly. If this is not available try adding missing signatures to
-F<src/call_list.txt> and rebuilding Parrot.
+F<src/nci/extra_thunks.nci>, running F<tools/dev/mk_nci_thunks.pl>, and
+rebuilding Parrot.
=cut
Modified: trunk/examples/nci/QtHelloWorld.pir
==============================================================================
--- trunk/examples/nci/QtHelloWorld.pir Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/examples/nci/QtHelloWorld.pir Fri Feb 19 01:53:12 2010 (r44152)
@@ -21,7 +21,8 @@
Note that this will either need JIT for building the NCI-functions on
the fly. If this is not available try adding missing signatures to
-F<src/call_list.txt> and rebuilding Parrot.
+F<src/nci/extra_thunks.nci>, running F<tools/dev/mk_nci_thunks.pl>, and
+rebuilding Parrot.
=cut
.sub main
Modified: trunk/src/nci/api.c
==============================================================================
--- trunk/src/nci/api.c Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/src/nci/api.c Fri Feb 19 01:53:12 2010 (r44152)
@@ -66,7 +66,7 @@
STRING *ns = CONST_STRING(interp, " is an unknown signature type");
STRING *message = Parrot_str_concat(interp, signature, ns, 0);
- ns = CONST_STRING(interp, ".\nCAN_BUILD_CALL_FRAMES is disabled, add the signature to src/nci/extra_call_list.nci");
+ ns = CONST_STRING(interp, ".\nCAN_BUILD_CALL_FRAMES is disabled, add the signature to src/nci/extra_thunks.nci");
message = Parrot_str_concat(interp, message, ns, 0);
/*
Modified: trunk/src/nci/core_thunks.nci
==============================================================================
--- trunk/src/nci/core_thunks.nci Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/src/nci/core_thunks.nci Fri Feb 19 01:53:12 2010 (r44152)
@@ -1,59 +1,10 @@
-# Copyright (C) 2002-2008, Parrot Foundation.
+# Copyright (C) 2002-2010, Parrot Foundation.
-# DO NOT EDIT THIS FILE.
-#
-# Any changes made here will be lost.
-#
-# This file is generated automatically by config/gen/call_list.pm
-# using config/gen/call_list/*.in .
-
-
-# Function signature declarations for Parrot Native Call Interface.
-# The first alphanumeric is the type of the return value,
-# the other alphanumerics denote the input parameter types.
-
-# Types
-
-# INT register stuff
-# I - INTVAL
-# c - char
-# s - short
-# i - int
-# l - long
-
-# NUM register stuff
-# N - FLOATVAL
-# f - float
-# d - double
-
-# STR register stuff
-# S - pointer to a STRING-register
-# t - character string (0-terminated)
-# Buffers are not valid return parameters,
-# use 'p' when the native function returns a pointer value
-# b - void *
-# B - void **
-
-# PMC register stuff
-# P - pointer to a PMC-register
-# O - pointer to PMC-register (object)
-# p - data pointer from PMC (on store into a new UnManagedStruct PMC)
-# 2 - pointer to short
-# 3 - pointer to int
-# 4 - pointer to long
-
-# void stuff
-# v - void
-
-# special stuff
-# 0 - insert a NULL (pointer) - doesn't consume a register
-# J - Parrot_Interp param
-# @ - slurpy array
+# This file contains the Parrot Native Call Interface signature
+# declarations required by Parrot's core. To add signatures for extensions,
+# add to F<src/nci/extra_thunks.nci>
-# callback stuff
-# U - Single PMC parameter to pass into callback - user data
-
-# Signatures
+# The format of this file is explained in F<src/nci/extra_thunks.nci>
d JOd # Parrot builtins
I JOS
Modified: trunk/src/nci/extra_thunks.nci
==============================================================================
--- trunk/src/nci/extra_thunks.nci Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/src/nci/extra_thunks.nci Fri Feb 19 01:53:12 2010 (r44152)
@@ -1,3 +1,52 @@
+# Copyright (C) 2002-2010, Parrot Foundation.
+
+# Function signature declarations for Parrot Native Call Interface.
+# The first alphanumeric is the type of the return value,
+# the other alphanumerics denote the input parameter types.
+
+# Types
+
+# INT register stuff
+# I - INTVAL
+# c - char
+# s - short
+# i - int
+# l - long
+
+# NUM register stuff
+# N - FLOATVAL
+# f - float
+# d - double
+
+# STR register stuff
+# S - pointer to a STRING-register
+# t - character string (0-terminated)
+# Buffers are not valid return parameters,
+# use 'p' when the native function returns a pointer value
+# b - void *
+# B - void **
+
+# PMC register stuff
+# P - pointer to a PMC-register
+# O - pointer to PMC-register (object)
+# p - data pointer from PMC (on store into a new UnManagedStruct PMC)
+# 2 - pointer to short
+# 3 - pointer to int
+# 4 - pointer to long
+
+# void stuff
+# v - void
+
+# special stuff
+# 0 - insert a NULL (pointer) - doesn't consume a register
+# J - Parrot_Interp param
+# @ - slurpy array
+
+# callback stuff
+# U - Single PMC parameter to pass into callback - user data
+
+# Signatures
+
# t/src/embed.t
v J
Modified: trunk/src/nci_test.c
==============================================================================
--- trunk/src/nci_test.c Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/src/nci_test.c Fri Feb 19 01:53:12 2010 (r44152)
@@ -67,7 +67,7 @@
/* Function declarations.
*** If you add a new test function here,
-*** please update src/libnci_test.def and src/call_list.txt too. ***
+*** please update src/libnci_test.def and src/nci/extra_thunks.nci too. ***
*/
Modified: trunk/tools/build/nativecall.pir
==============================================================================
--- trunk/tools/build/nativecall.pir Fri Feb 19 01:21:14 2010 (r44151)
+++ trunk/tools/build/nativecall.pir Fri Feb 19 01:53:12 2010 (r44152)
@@ -7,21 +7,21 @@
=head1 SYNOPSIS
- % ./parrot tools/build/nativecall.pir <src/call_list.txt >src/nci.c
+ % ./parrot tools/build/nativecall.pir -o src/nci/extra_thunks.c <src/nci/extra_thunks.nci
=head1 DESCRIPTION
-This script creates the Native Call Interface file F<src/nci.c>. It
-parses a file of function signatures of the form:
+This script creates Native Call Interface files. It parses a file of function
+signatures of the form:
<return-type-specifier><ws><parameter-type-specifiers>[<ws>][#<comment>]
...
Empty lines and lines containing only whitespace or comment are ignored.
-The types specifiers are documented in F<src/call_list.txt>.
+The types specifiers are documented in F<src/nci/extra_thunks.nci>.
=head1 SEE ALSO
-F<src/call_list.txt>.
+F<src/nci/extra_thunks.nci>.
F<docs/pdds/pdd16_native_call.pod>.
=cut
@@ -141,7 +141,7 @@
Creates a C file of routines suitable for use as Parrot NCI thunks.
-Usage ./parrot nativecall.pir [options] <input_signature_list.nci
+Usage ./parrot nativecall.pir [options] -o output_c_file.c <input_signature_list.nci
Options
--help print this message and exit
More information about the parrot-commits
mailing list