Changeset 1548


Ignore:
Timestamp:
Oct 22, 2011, 1:21:07 PM (6 years ago)
Author:
cameron
Message:

IDISA fixes

Location:
trunk
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • trunk/lib/idisa_cpp/idisa_avx.cpp

    r1539 r1548  
    11#ifndef IDISA_AVX_CPP
    22#define IDISA_AVX_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "immintrin.h"
    47
  • trunk/lib/idisa_cpp/idisa_sse2.cpp

    r1539 r1548  
    11#ifndef IDISA_SSE2_CPP
    22#define IDISA_SSE2_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "emmintrin.h"
    47
  • trunk/lib/idisa_cpp/idisa_sse3.cpp

    r1539 r1548  
    11#ifndef IDISA_SSE3_CPP
    22#define IDISA_SSE3_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "pmmintrin.h"
    47
  • trunk/lib/idisa_cpp/idisa_sse4_1.cpp

    r1539 r1548  
    11#ifndef IDISA_SSE4_1_CPP
    22#define IDISA_SSE4_1_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "smmintrin.h"
    47
  • trunk/lib/idisa_cpp/idisa_sse4_2.cpp

    r1539 r1548  
    11#ifndef IDISA_SSE4_2_CPP
    22#define IDISA_SSE4_2_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "smmintrin.h"
    47
  • trunk/lib/idisa_cpp/idisa_ssse3.cpp

    r1539 r1548  
    11#ifndef IDISA_SSSE3_CPP
    22#define IDISA_SSSE3_CPP
     3#include <stdint.h>
     4#include "../config.hpp"
     5
    36#include "tmmintrin.h"
    47
  • trunk/libgen/Configure/configure.py

    r1539 r1548  
    5555#if (BLOCKSIZE == 128)
    5656#include "idisa128.hpp"
    57 #define Bitblock bitblock128_t
     57typedef bitblock128_t BitBlock;
    5858template <uint32_t fw>
    5959class simd: public simd128<fw>
     
    7979#if (BLOCKSIZE == 256)
    8080#include "idisa256.hpp"
    81 #define Bitblock bitblock256_t
     81typedef bitblock256_t BitBlock;
    8282template <uint32_t fw>
    8383class simd: public simd256<fw>
  • trunk/libgen/Library_Generator/UI.py

    r1540 r1548  
    203203                                                fileOut.write(imp + "\n")
    204204               
    205                 fileOut.write("#endif")                 
     205                fileOut.write("#endif\n")                       
    206206                fileOut.close()
    207207               
     
    292292                #print libF.ToCText()
    293293               
    294                 fileOut.write("#endif")
     294                fileOut.write("#endif\n")
    295295                fileOut.close()
  • trunk/libgen/Makefile

    r1539 r1548  
    66IDISA_LIB_DIR = idisa_lib
    77IDISA_LIB_CPP_DIR = $(IDISA_LIB_DIR)/idisa_cpp
     8LIB_CPP_DIR = $(LIB_DIR)/idisa_cpp
    89
    910IDISA_GENERATOR = $(GENERATOR_DIR)/LibraryGenerator.py
     
    107108        mv $(GENERATOR_DIR)/$(IDISA).hpp $(IDISA_LIB_DIR)/
    108109       
    109         cp -rf $(IDISA_LIB_CPP_DIR)/ $(LIB_DIR)/
     110        cp $(IDISA_LIB_CPP_DIR)/*.cpp $(LIB_CPP_DIR)
    110111        cp $(IDISA_LIB_DIR)/$(IDISA128).hpp $(LIB_DIR)/
    111112        cp $(IDISA_LIB_DIR)/$(IDISA256).hpp $(LIB_DIR)/
Note: See TracChangeset for help on using the changeset viewer.