Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
michael@0 | 1 | /* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ |
michael@0 | 2 | /* This Source Code Form is subject to the terms of the Mozilla Public |
michael@0 | 3 | * License, v. 2.0. If a copy of the MPL was not distributed with this |
michael@0 | 4 | * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ |
michael@0 | 5 | |
michael@0 | 6 | /* Platform specific code to invoke XPCOM methods on native objects */ |
michael@0 | 7 | |
michael@0 | 8 | #include "xptcprivate.h" |
michael@0 | 9 | |
michael@0 | 10 | // Remember that these 'words' are 32bit DWORDS |
michael@0 | 11 | |
michael@0 | 12 | extern "C" { |
michael@0 | 13 | static uint32_t |
michael@0 | 14 | invoke_count_words(uint32_t paramCount, nsXPTCVariant* s) |
michael@0 | 15 | { |
michael@0 | 16 | uint32_t result = 0; |
michael@0 | 17 | for(uint32_t i = 0; i < paramCount; i++, s++) |
michael@0 | 18 | { |
michael@0 | 19 | if(s->IsPtrData()) |
michael@0 | 20 | { |
michael@0 | 21 | result++; |
michael@0 | 22 | continue; |
michael@0 | 23 | } |
michael@0 | 24 | switch(s->type) |
michael@0 | 25 | { |
michael@0 | 26 | case nsXPTType::T_I8 : |
michael@0 | 27 | case nsXPTType::T_I16 : |
michael@0 | 28 | case nsXPTType::T_I32 : |
michael@0 | 29 | result++; |
michael@0 | 30 | break; |
michael@0 | 31 | case nsXPTType::T_I64 : |
michael@0 | 32 | result+=2; |
michael@0 | 33 | break; |
michael@0 | 34 | case nsXPTType::T_U8 : |
michael@0 | 35 | case nsXPTType::T_U16 : |
michael@0 | 36 | case nsXPTType::T_U32 : |
michael@0 | 37 | result++; |
michael@0 | 38 | break; |
michael@0 | 39 | case nsXPTType::T_U64 : |
michael@0 | 40 | result+=2; |
michael@0 | 41 | break; |
michael@0 | 42 | case nsXPTType::T_FLOAT : |
michael@0 | 43 | result++; |
michael@0 | 44 | break; |
michael@0 | 45 | case nsXPTType::T_DOUBLE : |
michael@0 | 46 | result+=2; |
michael@0 | 47 | break; |
michael@0 | 48 | case nsXPTType::T_BOOL : |
michael@0 | 49 | case nsXPTType::T_CHAR : |
michael@0 | 50 | case nsXPTType::T_WCHAR : |
michael@0 | 51 | result++; |
michael@0 | 52 | break; |
michael@0 | 53 | default: |
michael@0 | 54 | // all the others are plain pointer types |
michael@0 | 55 | result++; |
michael@0 | 56 | break; |
michael@0 | 57 | } |
michael@0 | 58 | } |
michael@0 | 59 | return result; |
michael@0 | 60 | } |
michael@0 | 61 | |
michael@0 | 62 | void |
michael@0 | 63 | invoke_copy_to_stack(uint32_t* d, uint32_t paramCount, nsXPTCVariant* s) |
michael@0 | 64 | { |
michael@0 | 65 | for(uint32_t i = 0; i < paramCount; i++, d++, s++) |
michael@0 | 66 | { |
michael@0 | 67 | if(s->IsPtrData()) |
michael@0 | 68 | { |
michael@0 | 69 | *((void**)d) = s->ptr; |
michael@0 | 70 | continue; |
michael@0 | 71 | } |
michael@0 | 72 | switch(s->type) |
michael@0 | 73 | { |
michael@0 | 74 | // 8 and 16 bit types should be promoted to 32 bits when copying |
michael@0 | 75 | // onto the stack. |
michael@0 | 76 | case nsXPTType::T_I8 : *((uint32_t*)d) = s->val.i8; break; |
michael@0 | 77 | case nsXPTType::T_I16 : *((uint32_t*)d) = s->val.i16; break; |
michael@0 | 78 | case nsXPTType::T_I32 : *((int32_t*) d) = s->val.i32; break; |
michael@0 | 79 | case nsXPTType::T_I64 : *((int64_t*) d) = s->val.i64; d++; break; |
michael@0 | 80 | case nsXPTType::T_U8 : *((uint32_t*)d) = s->val.u8; break; |
michael@0 | 81 | case nsXPTType::T_U16 : *((uint32_t*)d) = s->val.u16; break; |
michael@0 | 82 | case nsXPTType::T_U32 : *((uint32_t*)d) = s->val.u32; break; |
michael@0 | 83 | case nsXPTType::T_U64 : *((uint64_t*)d) = s->val.u64; d++; break; |
michael@0 | 84 | case nsXPTType::T_FLOAT : *((float*) d) = s->val.f; break; |
michael@0 | 85 | case nsXPTType::T_DOUBLE : *((double*) d) = s->val.d; d++; break; |
michael@0 | 86 | case nsXPTType::T_BOOL : *((uint32_t*)d) = s->val.b; break; |
michael@0 | 87 | case nsXPTType::T_CHAR : *((uint32_t*)d) = s->val.c; break; |
michael@0 | 88 | case nsXPTType::T_WCHAR : *((wchar_t*) d) = s->val.wc; break; |
michael@0 | 89 | |
michael@0 | 90 | default: |
michael@0 | 91 | // all the others are plain pointer types |
michael@0 | 92 | *((void**)d) = s->val.p; |
michael@0 | 93 | break; |
michael@0 | 94 | } |
michael@0 | 95 | } |
michael@0 | 96 | } |
michael@0 | 97 | } |
michael@0 | 98 | |
michael@0 | 99 | EXPORT_XPCOM_API(nsresult) |
michael@0 | 100 | NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex, |
michael@0 | 101 | uint32_t paramCount, nsXPTCVariant* params) |
michael@0 | 102 | { |
michael@0 | 103 | uint32_t result, n; |
michael@0 | 104 | |
michael@0 | 105 | n = invoke_count_words(paramCount, params) * 4; |
michael@0 | 106 | |
michael@0 | 107 | __asm__ __volatile__( |
michael@0 | 108 | "subl %5, %%sp\n\t" /* make room for params */ |
michael@0 | 109 | "movel %4, %%sp@-\n\t" |
michael@0 | 110 | "movel %3, %%sp@-\n\t" |
michael@0 | 111 | "pea %%sp@(8)\n\t" |
michael@0 | 112 | "jbsr invoke_copy_to_stack\n\t" /* copy params */ |
michael@0 | 113 | "addw #12, %%sp\n\t" |
michael@0 | 114 | "movel %1, %%sp@-\n\t" |
michael@0 | 115 | "movel %1@, %%a0\n\t" |
michael@0 | 116 | "movel %%a0@(%2:l:4), %%a0\n\t" |
michael@0 | 117 | "jbsr %%a0@\n\t" /* safe to not cleanup sp */ |
michael@0 | 118 | "lea %%sp@(4,%5:l), %%sp\n\t" |
michael@0 | 119 | "movel %%d0, %0" |
michael@0 | 120 | : "=d" (result) /* %0 */ |
michael@0 | 121 | : "a" (that), /* %1 */ |
michael@0 | 122 | "d" (methodIndex), /* %2 */ |
michael@0 | 123 | "g" (paramCount), /* %3 */ |
michael@0 | 124 | "g" (params), /* %4 */ |
michael@0 | 125 | "d" (n) /* %5 */ |
michael@0 | 126 | : "a0", "a1", "d0", "d1", "memory" |
michael@0 | 127 | ); |
michael@0 | 128 | |
michael@0 | 129 | return result; |
michael@0 | 130 | } |