Permalink
Browse files

Remove nci.pmc and nci.h

  • Loading branch information...
1 parent d770f20 commit f098bf33fb5f4a20d6c43d34d57092e8c10211bb @atrodo atrodo committed Feb 15, 2013
Showing with 0 additions and 155 deletions.
  1. +0 −1 config/auto/pmc.pm
  2. +0 −49 config/gen/makefiles/root.in
  3. +0 −43 include/parrot/nci.h
  4. +0 −1 src/dynpmc/Defines.in
  5. +0 −1 src/multidispatch.c
  6. +0 −47 src/pmc/nci.pmc
  7. +0 −12 src/pmc/unmanagedstruct.pmc
  8. +0 −1 src/utils.c
View
@@ -415,7 +415,6 @@ include/parrot/sub.h
include/parrot/pmc_freeze.h
include/parrot/global_setup.h
include/parrot/gc_api.h
-include/parrot/nci.h
include/parrot/vtables.h
include/parrot/has_header.h
include/parrot/warnings.h
@@ -180,8 +180,6 @@ GEN_CONFIGS = \
lib/Parrot/PMC.pm \
$(RUN_INC_DIR)/config.fpmc \
$(LIBRARY_DIR)/config.pir \
-#IF(has_opengl): src/glut_nci_thunks.nci \
-#IF(has_glut): src/glut_callbacks.c \
src/core_pmcs.c \
config_lib.pir \
compilers/imcc/imcc.y.flag \
@@ -253,7 +251,6 @@ GEN_HEADERS = \
$(INC_DIR)/pbcversion.h
GEN_SOURCES = \
- src/glut_nci_thunks.c \
src/parrot_config.c \
src/null_config.c \
src/install_config.c \
@@ -394,7 +391,6 @@ PARROT_H_HEADERS = \
$(INC_DIR)/call.h \
$(INC_DIR)/key.h \
$(INC_DIR)/exit.h \
- $(INC_DIR)/nci.h \
$(INC_DIR)/scheduler.h \
$(INC_DIR)/thread.h \
$(INC_DIR)/thr_pthread.h \
@@ -573,7 +569,6 @@ ALL_PARROT_LIBS = @libparrot_linkflags@ $(ICU_SHARED) $(C_LIBS)
# dynamic extensions
DYNEXT_DIR = runtime/parrot/dynext
-LIBGLUTCB_SO = $(DYNEXT_DIR)/libglutcb$(LOAD_EXT)
###############################################################################
#
@@ -624,7 +619,6 @@ MAKE_C = @make_c@
all : \
corevm \
-#IF(has_glut): $(LIBGLUTCB_SO) \
$(DIS) \
$(PARROT_CONFIG) \
$(PBC_TO_EXE) \
@@ -1756,7 +1750,6 @@ src/multidispatch$(O) : \
$(INC_DIR)/oplib/ops.h \
$(PARROT_H_HEADERS) \
$(INC_PMC_DIR)/pmc_nativepccmethod.h \
- $(INC_PMC_DIR)/pmc_nci.h \
$(INC_PMC_DIR)/pmc_sub.h
src/packfile/api$(O) : \
@@ -1958,7 +1951,6 @@ src/warnings$(O) : $(PARROT_H_HEADERS) src/warnings.c
src/utils$(O) : \
$(PARROT_H_HEADERS) \
- $(INC_PMC_DIR)/pmc_nci.h \
src/utils.c \
$(EXTEND_HEADERS)
@@ -2479,9 +2471,6 @@ prog-clean :
src/null_config$(O) \
src/parrot_config$(O) \
src/install_config$(O) \
- src/glut_callbacks$(O) \
- src/glut_nci_thunks$(O) \
- $(LIBGLUTCB_SO) \
install_config.fpmc
$(PERL) $(BUILD_TOOLS_DIR)/c2str.pl --init
$(RM_F) \
@@ -2515,14 +2504,11 @@ archclean: dynext-clean
src/parrot_config$(O) \
src/install_config$(O) \
install_config.fpmc \
- src/glut_callbacks$(O) \
- $(LIBGLUTCB_SO) \
$(LIBPARROT_STATIC) \
$(LIBPARROT_SHARED)
dynext-clean :
# shared libs (LOAD_EXT, SHARE_EXT)
-# win32 import library (.lib - shared object is deleted by LIBNCI_TEST_SO above)
# win32 program data base - contains debugging info (.pdb)
# win32 incremental link status files (.ilk)
# win32 exported functions and data items (.exp)
@@ -3114,41 +3100,6 @@ win32-inno-installer : world installable
exec : src/parrot_config$(O) $(LIBPARROT)
$(LINK) @ld_out@$(EXEC)$(EXE) $(EXEC)$(O) src/parrot_config$(O) $(RPATH_BLIB) $(ALL_PARROT_LIBS) $(LINKFLAGS)
-###### OS depend targets ##########
-
-# for use by $(LIBRARY_DIR)/OpenGL.pir
-src/glut_callbacks$(O): \
- $(PARROT_H_HEADERS) \
- $(EXTEND_HEADERS) \
- src/glut_callbacks.c
-
-src/glut_nci_thunks.c: $(NCI_THUNK_GEN)
- $(NCI_THUNK_GEN) \
- --dynext \
- --loader-name=Parrot_glut_nci_loader \
- --output=src/glut_nci_thunks.c \
- --no-warn-dups \
- < src/glut_nci_thunks.nci
-
-src/glut_nci_thunks$(O) : $(PARROT_H_HEADERS) \
- src/glut_nci_thunks.c \
- $(INC_PMC_DIR)/pmc_nci.h
-
-$(LIBGLUTCB_SO): $(LIBPARROT) src/glut_callbacks$(O) src/glut_nci_thunks$(O)
- $(LD) @ld_out@$@ \
- src/glut_callbacks$(O) src/glut_nci_thunks$(O) \
- $(LINKARGS) @opengl_lib@
- $(ADDGENERATED) "$@" "[library]"
-
-# Cyclic dependency to parrot
-#src/nci/core_thunks.c : src/nci/core_thunks.nci $(DEV_TOOLS_DIR)/nci_thunk_gen.pir $(PARROT)
-# $(PARROT) $(DEV_TOOLS_DIR)/nci_thunk_gen.pir --core --output=$@ --nowarn-dups \
-# <src/nci/core_thunks.nci
-
-#src/nci/extra_thunks.c : src/nci/extra_thunks.nci $(DEV_TOOLS_DIR)/nci_thunk_gen.pir $(PARROT)
-# $(PARROT) $(DEV_TOOLS_DIR)/nci_thunk_gen.pir --core --output=$@ --nowarn-dups \
-# <src/nci/extra_thunks.nci
-
# emacs etags
# this needs exuberant-ctags
View
@@ -1,43 +0,0 @@
-/* nci.h
- * Copyright (C) 2001-2007, Parrot Foundation.
- * Overview:
- * The nci API handles building native call frames
- * Data Structure and Algorithms:
- * History:
- * Notes:
- * References:
- */
-
-#ifndef PARROT_NCI_H_GUARD
-#define PARROT_NCI_H_GUARD
-
-#include "parrot/parrot.h"
-
-typedef void (*native_pcc_method_t)(PARROT_INTERP);
-
-/* HEADERIZER BEGIN: src/nci/api.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/nci/api.c */
-
-/* HEADERIZER BEGIN: src/nci/libffi.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/nci/libffi.c */
-
-/* HEADERIZER BEGIN: src/nci/signatures.c */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: src/nci/signatures.c */
-
-#endif /* PARROT_NCI_H_GUARD */
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4 cinoptions='\:2=2' :
- */
@@ -53,7 +53,6 @@ DYNPMC_H_FILES_MIN = \
include/parrot/misc.h \
include/parrot/multidispatch.h \
include/parrot/namespace.h \
- include/parrot/nci.h \
include/parrot/oo.h \
include/parrot/op.h \
include/parrot/oplib.h \
View
@@ -41,7 +41,6 @@ them, with default behaviour.
#include "parrot/multidispatch.h"
#include "parrot/oplib/ops.h"
#include "multidispatch.str"
-#include "pmc/pmc_nci.h"
#include "pmc/pmc_nativepccmethod.h"
#include "pmc/pmc_sub.h"
#include "pmc/pmc_callcontext.h"
View
@@ -1,47 +0,0 @@
-/*
-Copyright (C) 2001-2012, Parrot Foundation.
-
-=head1 NAME
-
-src/pmc/nci.pmc - Native Call Interface
-
-=head1 DESCRIPTION
-
-The vtable functions for the native C call functions.
-
-=head2 Methods
-
-=over 4
-
-=cut
-
-*/
-
-/* HEADERIZER HFILE: none */
-/* HEADERIZER BEGIN: static */
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-
-/* Don't modify between HEADERIZER BEGIN / HEADERIZER END. Your changes will be lost. */
-/* HEADERIZER END: static */
-
-pmclass NCI auto_attrs provides invokable {
-}
-
-/*
-
-=back
-
-=head1 SEE ALSO
-
-F<docs/pdds/pdd03_calling_conventions.pod>.
-
-=cut
-
-*/
-
-/*
- * Local variables:
- * c-file-style: "parrot"
- * End:
- * vim: expandtab shiftwidth=4 cinoptions='\:2=2' :
- */
@@ -529,18 +529,6 @@ ret_pmc(PARROT_INTERP, ARGIN(PMC *pmc), ARGIN(char *p), int type, INTVAL idx)
/* this is a raw function pointer - not a PMC */
ret = *(PMC**) p;
- /* now check if initializer has a signature attached */
- if (PMC_metadata(ptr)) {
- STRING *signature_str = CONST_STRING(interp, "_signature");
- PMC * const sig = Parrot_pmc_getprop(interp, ptr, signature_str);
- if (VTABLE_defined(interp, sig)) {
- STRING * const sig_str = VTABLE_get_string(interp, sig);
- ret = Parrot_pmc_new(interp, enum_class_NCI);
- VTABLE_set_pointer_keyed_str(interp, ret, sig_str,
- *(PMC **)p);
- }
- }
-
return ret;
case enum_type_struct_ptr:
/* check the metadata for an initializer */
View
@@ -19,7 +19,6 @@ Opcode helper functions that don't really fit elsewhere.
#include "parrot/parrot.h"
#include "parrot/extend.h"
-#include "pmc/pmc_nci.h"
typedef unsigned short _rand_buf[3];

0 comments on commit f098bf3

Please sign in to comment.