← Back to branch summary

~ubuntu-branches/ubuntu/lucid/webkit/lucid-updates

« back to all changes in this revision

Viewing changes to JavaScriptCore/jit/JITStubs.h

  • Committer: Bazaar Package Importer
  • Author(s): Gustavo Noronha Silva
  • Date: 2010-01-06 21:25:06 UTC
  • mfrom: (1.2.6 upstream) (4.3.7 sid)
  • Revision ID: james.westby@ubuntu.com-20100106212506-gd0czn4zrwf1j19l
http://bugs.debian.org/529271
http://bugs.debian.org/559420
* New upstream release
- adds basic Content-Encoding support, thanks to soup
  (Closes: #529271)
- fixes over-advertising content types as supported by
  the media player (Closes: #559420)
* debian/control:
- updated libsoup build requirement (>= 2.28.2)
* debian/libwebkit-1.0-2.symbols:
- updated with new symbols
* debian/copyright:
- updated information since 1.1.17
* Imported patch from https://bugs.webkit.org/show_bug.cgi?id=30623
- I am shipping this patch because I believe it is correct, it is the
  way to go, it fixes a race, and it needs testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
JavaScriptCore/jit/JITStubs.h
75
75
        ReturnAddressPtr returnAddress() { return ReturnAddressPtr(asPointer); }
76
76
    };
77
77
 
78
 
#if PLATFORM(X86_64)
 
78
#if CPU(X86_64)
79
79
    struct JITStackFrame {
80
80
        void* reserved; // Unused
81
81
        JITStubArg args[6];
99
99
        // When JIT code makes a call, it pushes its return address just below the rest of the stack.
100
100
        ReturnAddressPtr* returnAddressSlot() { return reinterpret_cast<ReturnAddressPtr*>(this) - 1; }
101
101
    };
102
 
#elif PLATFORM(X86)
 
102
#elif CPU(X86)
103
103
#if COMPILER(MSVC)
104
104
#pragma pack(push)
105
105
#pragma pack(4)
130
130
#if COMPILER(MSVC)
131
131
#pragma pack(pop)
132
132
#endif // COMPILER(MSVC)
133
 
#elif PLATFORM(ARM_THUMB2)
 
133
#elif CPU(ARM_THUMB2)
134
134
    struct JITStackFrame {
135
135
        void* reserved; // Unused
136
136
        JITStubArg args[6];
158
158
        
159
159
        ReturnAddressPtr* returnAddressSlot() { return &thunkReturnAddress; }
160
160
    };
161
 
#elif PLATFORM(ARM_TRADITIONAL)
 
161
#elif CPU(ARM_TRADITIONAL)
162
162
    struct JITStackFrame {
163
163
        JITStubArg padding; // Unused
164
164
        JITStubArg args[7];
202
202
    #define STUB_ARGS_DECLARATION void** args
203
203
    #define STUB_ARGS (args)
204
204
 
205
 
    #if PLATFORM(X86) && COMPILER(MSVC)
 
205
    #if CPU(X86) && COMPILER(MSVC)
206
206
    #define JIT_STUB __fastcall
207
 
    #elif PLATFORM(X86) && COMPILER(GCC)
 
207
    #elif CPU(X86) && COMPILER(GCC)
208
208
    #define JIT_STUB  __attribute__ ((fastcall))
209
209
    #else
210
210
    #define JIT_STUB
211
211
    #endif
212
212
#endif
213
213
 
214
 
#if PLATFORM(X86_64)
 
214
#if CPU(X86_64)
215
215
    struct VoidPtrPair {
216
216
        void* first;
217
217
        void* second;
335
335
    int JIT_STUB cti_op_jlesseq(STUB_ARGS_DECLARATION);
336
336
    int JIT_STUB cti_op_jtrue(STUB_ARGS_DECLARATION);
337
337
    int JIT_STUB cti_op_load_varargs(STUB_ARGS_DECLARATION);
338
 
    int JIT_STUB cti_op_loop_if_less(STUB_ARGS_DECLARATION);
339
338
    int JIT_STUB cti_op_loop_if_lesseq(STUB_ARGS_DECLARATION);
340
 
    int JIT_STUB cti_op_loop_if_true(STUB_ARGS_DECLARATION);
341
339
    int JIT_STUB cti_timeout_check(STUB_ARGS_DECLARATION);
342
340
    int JIT_STUB cti_has_property(STUB_ARGS_DECLARATION);
343
341
    void JIT_STUB cti_op_create_arguments(STUB_ARGS_DECLARATION);